Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
7,662 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

7662 Commits (2a154838f9b1fb1b708d2e07130b24ed4716d1c2)

Author SHA1 Message Date
cora 1cc8a7f8df Merge pull request 'Remove ancient backup "init_new.lua"' (#2178) from remove_ancient_backup_file into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2178
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-05-05 12:32:11 +00:00
cora 6a2fe2eb4f remove ancient backup "init_new.lua" 2022-05-05 04:05:08 +00:00
cora 6674684998 Merge pull request 'Add deepslate, copper and raw_ores by NO11' (#2141) from deepslate-copper-rawores into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2141
Reviewed-by: AFCMS <afcm.contact@gmail.com>
 2022-05-05 00:40:31 +00:00
kabou 1266396e1d Add cobbled deepslate to cobble group. 
By adding cobbled deepslate to the group "cobble", it automatically
inherits  all crafting recipes and tool repair capabilities that apply
to that group.

* Add `cobble=1` to cobbled deepslate node definition groups.  This
  requires a little refactoring of the deepslate variants registration
  function.
* Remove stone tools, furnace and brewing stand crafting recipes.
 2022-05-05 01:45:03 +02:00
kabou f5abc28190 Allow smelting of deepslate ores. 
* Register "cooking" crafting recipe for deepslate ores that enables
  smelting these ores in furnaces.
* Extend deepslate ore registration function to allow passing cooking
  result as argument.
* Update the deepslate ore table to include smelting results.
* Put deepslate w/ lapis drops in a separate table, making the deepslate
  ores table less unwieldly.
 2022-05-04 23:35:07 +00:00
AFCMS f8f6ea22c8 Fix codestyle issues with `mcl_deepslate`, `mcl_copper`, `mcl_raw_ores` 2022-05-04 23:35:07 +00:00
cora b0b8ef3921 Comment out ore registrations for now 
The discussion about how to handle the new ores is still ongoing.
This PR was originally only intended to add the new nodes so
that's what it does now.
 2022-05-04 23:35:07 +00:00
cora be6d2db7d4 remove redundant license files 2022-05-04 23:35:07 +00:00
cora dc40ed18b3 remove raw_ores item override 2022-05-04 23:35:07 +00:00
cora 1b99de73d2 remove screenshots from original mods 2022-05-04 23:35:07 +00:00
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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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  https://git.minetest.land/MineClone2/MineClone2/issues/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/chmodsayshello/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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: https://git.minetest.land/MineClone2/MineClone2/pulls/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