Commit Graph

7602 Commits

Author SHA1 Message Date
NO11 c97e0cd631 Add deepslate 2022-05-04 23:35:07 +00:00
NO11 8c7a8a61d2 Add Copper 2022-05-04 23:35:07 +00:00
NO11 6bdaa9f2d1 Add raw ores 2022-05-04 23:35:06 +00:00
cora 8b8a133381 Merge pull request 'Fix undefined variable in mcl_enchanting/engine.lua.' (#2177) from fix_enchanting into master
Reviewed-on: MineClone2/MineClone2#2177
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-05-04 23:34:18 +00:00
kabou dceb48bf94 Fix undefined variable in mcl_enchanting/engine.lua. 2022-05-04 23:31:54 +00:00
cora e10c06ba98 Merge pull request 'Remove 2D preview + fix enchanting overlay (Fix #1869, #2161)' (#2162) from remove_3d_preview into master
Reviewed-on: MineClone2/MineClone2#2162
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-05-04 23:20:50 +00:00
AFCMS 8a47a195f6 Remove preview files 2022-05-04 23:15:11 +00:00
AFCMS d0b60e2399 Fix player armor enchanting overlay (#2161) 2022-05-04 23:15:11 +00:00
AFCMS 3ca40cd4e4 Remove 2D preview 2022-05-04 23:15:11 +00:00
cora 0e8a87befa Merge pull request 'Bookshelves are deco blocks, not building blocks.' (#2175) from bookshelf-deco-block into master
Reviewed-on: MineClone2/MineClone2#2175
2022-05-04 23:11:57 +00:00
kabou 920b8b9654 Bookshelves are deco blocks, not building blocks. 2022-05-04 23:06:05 +00:00
cora dab80c45fd Merge pull request 'Add "cobble" group.' (#2174) from cobble_group into master
Reviewed-on: MineClone2/MineClone2#2174
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-05-04 23:05:01 +00:00
kabou f1a494ea62 Change stone tool repair materal to group:cobble.
* Update repair material for stone tools (pick, shovel, axe, sword and
  hoe) to use any cobble group stone.
2022-05-05 01:01:29 +02:00
kabou 64bb50dfd5 Change some crafting recipes to use group:cobble.
* Update crafting recipes for stone tools (pick, shovel, axe, sword and
hoe), furnace and brewing stand to use any cobble group stone.
2022-05-04 15:54:12 +02:00
kabou 9edb40b5c5 Add cobblestone to the `cobble` group. 2022-05-04 15:14:23 +02:00
kabou b0ae135b3c Add `cobble` group.
* Add `cobble` group to GROUPS.md, to be used in crafting recipes.
2022-05-04 15:12:27 +02:00
cora b13835dd6f Merge pull request 'Fix crash when trying to use awards if they are disabled for the player (#2164)' (#2170) from awards_crashfix into master
Reviewed-on: MineClone2/MineClone2#2170
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-05-03 20:11:44 +00:00
chmodsayshello 3699ca5535 update translation template 2022-05-03 15:21:18 +00:00
chmodsayshello 9c652df8a2 update german translation 2022-05-03 14:59:49 +00:00
chmodsayshello 390802a344 fix crash when achievements are disabled and /awards is being used
This commit fixes  MineClone2/MineClone2#2164, which crashes the game whenever /awards is called with arguments other than enable
2022-05-03 14:58:44 +00:00
cora a27abae045 Merge pull request 'Fix warning in mcl_weather (#2157)' (#2168) from fix_weather_warning into master
Reviewed-on: MineClone2/MineClone2#2168
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
2022-05-03 00:41:06 +00:00
cora 61a999fe5a Fix warning in mcl_weather 2022-05-02 21:47:33 +02:00
cora 85afc8bd53 Merge pull request 'Fix `add_large_plant()` argument mismatch in mcl_flowers.' (#2156) from fix-flowers-fortune into master
Reviewed-on: MineClone2/MineClone2#2156
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-05-01 10:32:49 +00:00
kabou ed8995acec Fix `add_large_plant()` argument mismatch.
* In commit 86b2cd70f9 an extra argument
  was added to the `add_large_plant()` function in order to handle silk
  touch.  For some reason, the callers for "double_grass" and
  "double_fern" were updated with two new arguments.  Because of this,
  silk touch likely never worked on these nodes.  This commit removes
  the unused `nil` argument from both callers.
* This commit fixes #2155.
2022-05-01 10:31:01 +00:00
cora 38f1db7a04 Merge pull request 'Add Lodestones (rebased)' (#2154) from chmodsayshello/MineClone2:lodestone_rebased into master
Reviewed-on: MineClone2/MineClone2#2154
Reviewed-by: cora <cora@noreply.git.minetest.land>
2022-05-01 00:38:50 +00:00
chmodsayshello f1c60a48e0 remove debug logging 2022-04-30 10:02:04 +00:00
chmodsayshello c97fc42b68 upload textures 2/2 2022-04-30 09:02:17 +00:00
chmodsayshello 92cd3381ad upload textures 1/2 2022-04-30 09:01:57 +00:00
chmodsayshello f7a5862df2 update mcl_itemframes to use get_compass_image correctly 2022-04-30 08:59:25 +00:00
chmodsayshello ba8e072265 update mcl_compass dependencies 2022-04-30 08:58:04 +00:00
chmodsayshello f9d8b61dc1 update mcl_compass init.lua 2022-04-30 08:57:03 +00:00
chmodsayshello dd727510ba Merge pull request 'Update Fork' (#4) from MineClone2/MineClone2:master into master
Reviewed-on: chmodsayshello/MineClone2#4
2022-04-30 08:55:15 +00:00
cora a4e8c0b884 Merge pull request 'Add packed ice crafting recipe' (#2145) from add-packed-ice-recipe into master
Reviewed-on: MineClone2/MineClone2#2145
2022-04-27 22:04:23 +00:00
Nils Dagsson Moskopp 057051aa6d Add packed ice crafting recipe 2022-04-27 00:33:01 +02:00
cora 83aebb8b99 Merge pull request 'set version to 0.75 (indev)' (#2144) from 075-indev into master
Reviewed-on: MineClone2/MineClone2#2144
2022-04-26 09:51:05 +00:00
cora deb2e1c50b set version to 0.75 (indev) 2022-04-26 11:50:11 +02:00
cora 7d9cbd5f84 Merge pull request 'change version to 0.74' (#2143) from release_074 into master
Reviewed-on: MineClone2/MineClone2#2143
2022-04-26 03:55:15 +00:00
cora deb2c4ab50 change version to 0.74 2022-04-26 05:53:20 +02:00
cora 64ec36fe36 Merge pull request 'Dirt types fixes' (#2109) from dirt_type_fixes into master
Reviewed-on: MineClone2/MineClone2#2109
2022-04-25 21:39:27 +00:00
Nils Dagsson Moskopp cbf3dc49aa Replace grass path with dirt path
If a player wants to make a path when there is no dirt with grass on the
ground it means they need to either have silk touch to collect dirt with
grass or place dirt beside dirt with grass and wait for the grass cover
to spread before they can create the new paths …

Since the former is not possible early in the game and the latter is not
easy, this patch imitates Minecraft 1.17 behaviour; the following nodes
can now be turned into path nodes by right-clicking them with a shovel:

• Dirt (mcl_core:dirt)
• Coarse Dirt (mcl_core:coarse_dirt)
• Dirt with Grass (mcl_core:dirt_with_grass)
• Mycelium (mcl_core:mycelium)
• Podzol (mcl_core:podzol)

A group “path_creation_possible” has been added to mark nodes that can
be turned into a dirt path with a shovel. One obvious objection to that
addition might be that the “dirt” group already exists. Even though all
existing nodes that can be turned into a dirt path do indeed belong to
the “dirt” group, it is not a good idea: Changing what “dirt” means to
“any node that can be turned into a dirt path” would make it harder to
maintain the code.
2022-04-25 15:33:01 +02:00
cora 6bc676545b Allow saplings to grow on coarse d. and mycelium 2022-04-25 15:30:45 +02:00
chmodsayshello 77c2f9371e Merge pull request 'Update Fork' (#1) from MineClone2/MineClone2:master into master
Reviewed-on: chmodsayshello/MineClone2#1
2022-04-25 12:31:14 +00:00
cora 4cdb1130af Merge pull request 'Add hypercopyrighted end crystal beam texture' (#2134) from add-hypercopyright-beam into master
Reviewed-on: MineClone2/MineClone2#2134
2022-04-25 03:38:10 +00:00
cora 5f126c4686 add hypercopyrighted end crystal beam texture
This texture has the following poem written by me, cora, encoded in its
pixeldata. I the author hereby release both the texture file and the
poem as cc0.

Additionally I explicitly consent with its inclusion into MineClone2,
MineClone5 and Mineclonia as well as any other minetest game for this
day and all the days to come.

Shall though betray me with a texture, mate
I'll smile at though just like a summer's day
The raindrop particles - no laggy state
But spring is coming, really, soon it's may

As If the seasons meant a damn to us
They do not exist in mineclone at all
unreal water flow, iron never rusts
but copper does in summer and in fall

But what this literally is about
because this damn thing is really silly
you see somehow they had to say it loud

I would bring that quote with painting lilys
but plagerism everywhere you see
so this will just be good enough for me
2022-04-24 01:46:57 +02:00
cora dd12417529 Merge pull request 'Use uncarved pumpkin in survival' (#2119) from uncarved_pumpkins into master
Reviewed-on: MineClone2/MineClone2#2119
Reviewed-by: kabou <kabou@noreply.git.minetest.land>
2022-04-22 20:01:23 +00:00
Nils Dagsson Moskopp 67ae203772 Trigger node callbacks when pumpkin is sheared
The code for shearing a pumpkin used minetest.swap_node() to replace a
faceless pumpkin with a carved pumpkin. This did not trigger the node
callbacks of the carved pumpkin, which meant that shearing a pumpkin
would not check for the snow golem or iron golem spawn conditions.

This patch replaces minetest.swap_node() in the code for shearing a
pumpkin with minetest.set_node(), which does trigger the callbacks;
therefore snow and iron golems can now spawn as a pumpkin is carved.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp 5ba36c08b6 Drop carved pumpkin when shearing snow golem 2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp 56db877360 Disconnect gourd stems after destruct
While testing the previous commit, it became clear that gourd stems do
not disconnect properly if the gourd disappears while not being dug. A
simple method to create illegal curved stems was to explode the gourd.

This patch changes gourds so that the stem curves back after a gourd is
destroyed, regardless of reason. This hopefully makes curved stems that
are not connected to matching gourds a relict of the past.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp e1d67a2095 Disconnect stems from carved pumpkins after dig
Carved pumpkins can end up being connected to a stem – either if they
were grown in a previous version of MineClone2 or Mineclonia, or if a
player carves them before harvesting them. This patch makes sure that
stems turn into unconnected stems after such a carved pumpkin is dug.
2022-04-22 18:07:37 +00:00
Nils Dagsson Moskopp a2dd8c935d Make villagers accept uncarved pumpkin in trades
As map generation and growing mechanics have been changed to generate
uncarved pumpkins instead of carved, requiring players to shear every
pumpkin before trading it with villagers seems like useless busywork.
2022-04-22 18:07:37 +00:00