Commit graph

8594 commits

Author SHA1 Message Date
cora
fbe048087f Merge pull request 'Add wither spawning by EliasFleckenstein03' (#2146) from wither_spawning into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2146
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
2022-05-06 20:57:43 +00:00
Elias Fleckenstein
34e5bb0334 Add Wither Spawning 2022-05-06 19:40:39 +00:00
Elias Fleckenstein
c05a2d3a9d Add wither spawning schems 2022-05-06 19:40:39 +00:00
cora
40d2e3b2b1 Merge pull request 'Fix referencing mistake with cracked deepslate' (#2184) from fix_ds_bricks into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2184
2022-05-06 17:24:09 +00:00
cora
f1fc84b31b fix referencing mistake with cracked deepslate 2022-05-06 10:48:02 +00:00
cora
85fb33aa4c Merge pull request 'Add amethyst stuff by emojigit and kay27' (#2149) from amethyst into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2149
Reviewed-by: AFCMS <afcm.contact@gmail.com>
2022-05-05 20:54:46 +00:00
AFCMS
f9a2dacdd4 Fix texture and sound names in mcl_amethyst 2022-05-05 22:49:23 +02:00
AFCMS
00c70014c7 Fix codestyle and translation of mcl_amethyst 2022-05-05 22:49:23 +02:00
3raven
f4020ebd31 mcl_amethyst.fr.tr
Translation
2022-05-05 22:49:23 +02:00
kay27
74322ead49 #11 Polish amethyst stuff 2022-05-05 22:49:23 +02:00
kay27
1a83f50505 Fix amethyst buds light levels again 2022-05-05 22:49:23 +02:00
kay27
206c98e354 Fix various amethyst errors, better seed function 2022-05-05 22:49:23 +02:00
kay27
69e83d5c0a #11 Spawn buds 2022-05-05 22:49:23 +02:00
kay27
d3dfd13f78 #11 Fix the style, add template.txt, add Russian translation 2022-05-05 22:49:23 +02:00
kay27
e28ccd9a80 #11 Put tabs instead of each 2 spaces 2022-05-05 22:49:23 +02:00
kay27
a5fba06a2c #11 Remove amethyst screenshot 2022-05-05 22:49:23 +02:00
Emojigit
6c36c83a18 AMethyst Growing 2022-05-05 22:49:23 +02:00
Emojigit
48a4e069f9 craft bugfix 2022-05-05 22:49:23 +02:00
Emojigit
60e04438e0 typo missing space 2022-05-05 22:49:23 +02:00
Emojigit
0b01d299ea 更新 'mods/ITEMS/mcl_amethyst/init.lua' 2022-05-05 22:49:23 +02:00
Emojigit
ebdf944dda amethyst bud 2022-05-05 22:49:23 +02:00
Emojigit
794e10df4e [mcl_amethyst] INIT
* Amethyst Block
* Budding Amethyst (won't  grow amethyst now)
* New spyglass recipe
* Tinted Glass
* Calcite
2022-05-05 22:49:23 +02:00
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