chmodsayshello
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update fork #6

Merged
chmodsayshello merged 260 commits from VoxeLibre/VoxeLibre:master into master 2022-05-29 21:37:34 +02:00
Conversation 0 Commits 260 Files Changed 431 +9550 -6756

260 Commits

Author SHA1 Message Date
cora a85bf22695 Merge pull request 'Spawn witch and black cat on witchhut generation' (#2246) from spawn_witches into master 
Reviewed-on: MineClone2/MineClone2#2246
 2022-05-29 00:35:37 +00:00
cora e4a4648b25 fix size of black cat texture 2022-05-29 02:34:02 +02:00
cora 6b9cb0062d save home coords in cat entity as well 2022-05-29 02:34:02 +02:00
cora 2337e72a23 simplify spawn logic 2022-05-29 02:34:02 +02:00
cora da6563a5b3 Spawn witch and black cat on witchhut generation 2022-05-29 02:34:02 +02:00
cora 41ebaf12a5 Merge pull request 'fix indoor weather + multiplayer issue' (#2250) from weather_fixes into master 
Reviewed-on: MineClone2/MineClone2#2250
 2022-05-29 00:32:16 +00:00
cora a179a1cb62 fix indoor weather + multiplayer issue 2022-05-29 02:24:12 +02:00
cora 663e6dfe9e Merge pull request 'Add Parrot perching' (#2232) from parrot_perching_2 into master 
Reviewed-on: MineClone2/MineClone2#2232
 2022-05-29 00:22:52 +00:00
cora 7bc63d2882 fix mcl_mobs api_changes 2022-05-28 00:06:29 +02:00
cora c0a9cb7020 don't hurt perched parrot on punch 2022-05-28 00:05:04 +02:00
cora e90e17e533 clean up perch code, smoother behavior 2022-05-28 00:05:04 +02:00
cora 3d13000599 tweak detaching behavior 2022-05-28 00:05:04 +02:00
cora 86bc398a79 don't do flying animation while perching,fix anims 2022-05-28 00:05:04 +02:00
cora 14ec1aa014 add basic parrot perching 2022-05-28 00:05:04 +02:00
cora c1114211fc Merge pull request 'Fix crash on non existent xp-hud due to gamemode' (#2249) from fix-gamemode-xp into master 
Reviewed-on: MineClone2/MineClone2#2249
 2022-05-27 18:15:48 +00:00
cora ae2860d017 Show/Hide XP-hud immediately after gamemode switch 2022-05-27 19:56:47 +02:00
cora 1127231ca9 Fix crash on non existent xp-hud due to gamemode 2022-05-27 15:06:25 +02:00
cora ff6af32ddf Merge pull request 'mobs-redo mobitems breakup' (#2247) from mobs-redo-mobitem-breakup into master 
Reviewed-on: MineClone2/MineClone2#2247
 2022-05-27 00:54:01 +00:00
cora 4dba637ed8 readd lost horse armor inv images - confusing names 2022-05-27 02:44:39 +02:00
Lizzy Fleckenstein e7898352d8 Remove mobs_mc_gameconfig 2022-05-27 02:44:39 +02:00
cora d887a97310 Merge pull request 'Add entity cramming' (#2226) from entity_cramming into master 
Reviewed-on: MineClone2/MineClone2#2226
Reviewed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
 2022-05-26 12:21:46 +00:00
cora 47fa43825c count only mobs for cramming 2022-05-26 14:20:19 +02:00
cora af7dc0fb8f change "constant" declaration to match mcl_mobs 2022-05-26 14:16:38 +02:00
cora 87f50d6423 entity cramming: clean up check logic 2022-05-26 14:16:38 +02:00
cora fb4f21cba0 entity cramming: spare the children 2022-05-26 14:16:38 +02:00
cora 85b599edba entity cramming: check less often 2022-05-26 14:16:38 +02:00
cora b4cbc528a3 mcl_mobs: add entity_cramming 2022-05-26 14:16:38 +02:00
Lizzy Fleckenstein 96dcfb8a62 Merge pull request 'Strip trailing whitespace from files' (#2240) from EliasFleckenstein03/MineClone2:fmt into master 
Reviewed-on: MineClone2/MineClone2#2240
 2022-05-26 05:36:32 +00:00
Lizzy Fleckenstein f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
Lizzy Fleckenstein 6a054556cc
Add tool to strip trailing whitespace 2022-05-26 07:28:05 +02:00
cora 8210fba65b Merge pull request 'Mobs Redo Part 1' (#2245) from mobs-redo-basic-cleanup into master 
Reviewed-on: MineClone2/MineClone2#2245
 2022-05-25 21:19:07 +00:00
Lizzy Fleckenstein dd1f8cb59c Remove enderman gameconfig 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein ff33794487 Rename mobs global to mcl_mobs 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein e0f70b54ec Remove _cmi_is_mob 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein 4054f05a4c Remove support for invisibility mod 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein f6be8bac5a Remove checks for MCL2 mods 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein 8db9e76529 Remove unused version field 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein 6ae722a6ee Remove use_cmi 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein fc3992ceb6 Remove mobs.is_creative 2022-05-25 23:13:33 +02:00
cora d3afccad64 Merge pull request 'Fix warnings in mcl_bells and mcl_beds' (#2243) from EliasFleckenstein03/MineClone2:warn into master 
Reviewed-on: MineClone2/MineClone2#2243
 2022-05-25 17:54:28 +00:00
Lizzy Fleckenstein 569288b782
Fix warnings in mcl_bells and mcl_beds 2022-05-25 19:37:36 +02:00
cora 950a0607f1 Merge pull request 'Add /gamemode command for per player gamemode' (#2235) from creative_gamemode_2 into master 
Reviewed-on: MineClone2/MineClone2#2235
Reviewed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
 2022-05-25 14:43:06 +00:00
cora d863a6298b fix/simplifiy things from review 2022-05-25 16:36:04 +02:00
cora 2499fe1e83 add complete input validation, better result msgs 2022-05-25 05:43:49 +02:00
cora f89780695e Add /gamemode command for per player gamemode 2022-05-25 05:43:49 +02:00
cora e2fc41cf51 Merge pull request 'Fix wrong argument to is_creative_enabled' (#2237) from fix_wtong_is_creative_usage into master 
Reviewed-on: MineClone2/MineClone2#2237
 2022-05-25 03:42:12 +00:00
cora 6a2f9e1a16 Fix wrong argument to is_creative_enabled 2022-05-25 03:41:43 +00:00
cora efbf3d9750 Merge pull request 'make soul fire drop nothing when dug' (#2238) from fix_soul_fire_drop into master 
Reviewed-on: MineClone2/MineClone2#2238
 2022-05-25 03:40:54 +00:00
cora bda5073d86 make soul fire drop nothing when dug 2022-05-25 05:27:52 +02:00
cora 8ad9dd0b86 Merge pull request 'Add blackstone by debian044' (#2142) from blackstone into master 
Reviewed-on: MineClone2/MineClone2#2142
 2022-05-24 11:29:12 +00:00
cora 11e8e7d4cc Add soul_group to s.soil&sand, torch fix recpipe 2022-05-24 13:25:59 +02:00
kabou 1931a85f24 Add blackstone to cobble group. 
By adding blackstone to the group "cobble", it automatically inherits
all crafting recipes and tool repair capabilities that apply to that
group.

* Add `cobble=1` to blackstone node definition groups.
* Remove stone tools and furnace crafting recipes.
 2022-05-24 13:25:45 +02:00
cora 0c65363a09 replace ' with " 2022-05-24 13:25:45 +02:00
cora b6a647e119 remove unused vars 2022-05-24 13:25:45 +02:00
cora 23e5a1c7d3 Comment out ore generation for now 
The discussion about how to handle this is still ongoing. Since
this is about getting the new nodes disable ore registration
for now.
 2022-05-24 13:25:45 +02:00
cora 0d8436b343 fix soul fire 2022-05-24 13:25:45 +02:00
cora 29c16eaa75 remove superfluous torch models 2022-05-24 13:25:45 +02:00
cora 2d81d31139 Fix soul torch to use the actual mcl_torches api 2022-05-24 13:25:45 +02:00
cora a9be3f0f96 remove excessive newlines 2022-05-24 13:25:45 +02:00
cora 181a7d3b11 make nether gold gen. respect mcl_generate_ores 2022-05-24 13:25:45 +02:00
cora 430dc7fd8c remove packed ice recipe 2022-05-24 13:25:45 +02:00
cora c6312e7bdd use vector.new instead of normal tables 2022-05-24 13:25:45 +02:00
cora d9f2db5950 adapt readme to mcl2 2022-05-24 13:25:45 +02:00
cora 6b058d6f38 remove changelog.md 2022-05-24 13:25:45 +02:00
cora dd928db9ea fix soul torch recipe 2022-05-24 13:25:45 +02:00
cora 67e026cb12 blackstone: remove soul lantern dupe(mcl_lanterns) 2022-05-24 13:25:45 +02:00
cora 4a0a9ba482 move depends.txt to mod.conf, add author field 2022-05-24 13:25:45 +02:00
debian044 16d79996c0 Add blackstone via cp -r & git add * ^^ 2022-05-24 13:25:45 +02:00
cora c71a6d5df7 Merge pull request 'Run tools/generate_ingame_credits.lua' (#2228) from EliasFleckenstein03/MineClone2:generate_ingame_credits into master 
Reviewed-on: MineClone2/MineClone2#2228
 2022-05-22 20:30:26 +00:00
Lizzy Fleckenstein 60c463b8f9
Run tools/generate_ingame_credits.lua 
This should be run every time CREDITS.md is changed.
 2022-05-22 21:41:40 +02:00
cora fc428da6fd Merge pull request 'Villager employment system and mob-api enhancements' (#2209) from villagers_jobsites into master 
Reviewed-on: MineClone2/MineClone2#2209
 2022-05-22 13:22:41 +00:00
cora 028d1c1f4f do not tame villagers 2022-05-22 14:43:44 +02:00
cora a5ba8f739f Add bell to villager trades 2022-05-22 02:01:21 +02:00
cora d34191f00c villagers go to the bell if it's rung(for now) 
this will help with further testing pathfinding until villagers
get a proper schedule and do more things
 2022-05-22 02:01:21 +02:00
cora ec73afd21a use iron texture for apprentice badge, not stone 2022-05-22 02:01:21 +02:00
cora fca259c074 fix crash during (artificial) village creation 
when using the village tool doing that on an unsuitable location
would result in no position for the belltower being available
this checks for that and ... doesn't crash then ^^
 2022-05-22 02:01:21 +02:00
cora 7379d5bee8 Add Belltower to villages 2022-05-21 14:48:56 +02:00
cora d67dd0577f fix crash through forgotten function call 2022-05-21 12:36:57 +02:00
cora e353ec3b16 Iron golems pick and pick up one (stack of) poppy 2022-05-21 12:36:57 +02:00
cora 5dafeaadc6 Fix indentation in mcl_mobs/api.txt 2022-05-21 12:36:57 +02:00
cora 2b63866c14 spawn villagers (and golem) immediately after mg 2022-05-21 12:36:57 +02:00
cora 27d0d778e2 Update TODO list 2022-05-21 12:36:57 +02:00
cora a74fcab06b Make iron golem stay near set _home position 2022-05-21 12:36:57 +02:00
cora e51ea1e079 initialize inventory nodes on mapgen 2022-05-21 12:36:57 +02:00
cora e5806215f0 fix possible crash 2022-05-21 12:36:57 +02:00
cora 08b36e3eb3 Add textures for all professions 2022-05-21 12:36:57 +02:00
cora 53df441c1b Don't pick up near player, add more breeding stuff 2022-05-21 12:36:57 +02:00
cora 873e018faf Dynamically add trading tier badge to texture 2022-05-21 12:36:57 +02:00
cora b58422a584 write villager id into bed nodemeta 2022-05-21 12:36:57 +02:00
cora 3ff4ea576d spawn iron golem on villagegen 2022-05-21 12:36:57 +02:00
cora 539c31e8d6 fix trading crash 2022-05-21 12:36:57 +02:00
cora db865ede56 villagers open doors in daytime and close at night 2022-05-21 12:36:57 +02:00
cora 0d56ef1a90 add jobsites to villagegen schematics 2022-05-21 12:36:57 +02:00
cora 67939f7b7a pathfinding: find doors close to target as well 2022-05-21 12:36:57 +02:00
cora 9ccbf91706 mobs api: document api additions 2022-05-21 12:36:57 +02:00
cora dfb74cf9e9 mobs: add nofollow option so v. dont follow bread 2022-05-21 12:36:57 +02:00
cora 9a866e873e breed by throwing bread at villagers 2022-05-21 12:36:57 +02:00
cora e6b65af3b4 add mobs item pickup 2022-05-21 12:36:57 +02:00
cora 4ac41a793e fix two crashes in pathfinding 2022-05-21 12:36:57 +02:00
cora 98231f15ae change function name go_wplist -> gopath 2022-05-21 12:36:57 +02:00
cora e3bb7fe4be codestyle: replace inline functions 2022-05-21 12:36:57 +02:00
cora f8fc111b4a pathfind to jobsites 2022-05-21 12:36:57 +02:00
cora dbc5564d02 move movement code to mcl_mobs 2022-05-21 12:36:57 +02:00
cora ce7a882c86 Show trade tier in formspec 2022-05-21 12:36:57 +02:00
cora 12bc8f1a3b initial pathfinding experiments 
to test rightclick a villager and it will try to path find to
0,9,0 (i'm using flat mapgen for testing for now).
 2022-05-21 12:36:57 +02:00
cora 0598aa35c0 add simple jobsite logic 2022-05-21 12:36:57 +02:00
cora 72f2cd26f8 Merge pull request 'Add bell' (#2216) from add_bell into master 
Reviewed-on: MineClone2/MineClone2#2216
 2022-05-21 10:36:04 +00:00
cora e9f4f500d9 bell: slightly tweak bottom texture 2022-05-21 12:35:22 +02:00
cora 63b6a1d176 Update README.md 2022-05-20 21:54:42 +02:00
cora 1ba12aec60 Add new textures, make bell a nodebox 
thx erlehmann for the nodebox <3
 2022-05-20 21:27:12 +02:00
cora 4ba570e3b4 remove mesecons dependency 2022-05-20 13:45:45 +02:00
cora bf1a939564 fix bell sound 2022-05-20 13:44:17 +02:00
cora fe164e5f41 add basic mcl2 node properties 2022-05-20 13:36:41 +02:00
kay27 a6e9afbb93 Add bell from mcl5 2022-05-20 13:33:39 +02:00
cora dc30517cd9 Merge pull request 'xmas chests' (#2215) from xmas-chests into master 
Reviewed-on: MineClone2/MineClone2#2215
 2022-05-20 10:41:06 +00:00
Nils Dagsson Moskopp c9c14d6ff0 Add noise to christmas chest textures 2022-05-20 04:13:13 +02:00
Nils Dagsson Moskopp ff384c9588 Reskin chests as presents on December 24th to 26th 2022-05-20 04:13:01 +02:00
cora 1192fe5450 Merge pull request 'Smoker and Blast furnace fixes' (#2213) from blast_furnace_fix into master 
Reviewed-on: MineClone2/MineClone2#2213
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-18 14:45:56 +00:00
cora c4e51650f8 smoker & bfurnace: More concise short descriptions 2022-05-18 13:37:34 +02:00
cora 8426e7826a Fix smoker fuel not being burned at twice the rate. 2022-05-18 13:30:00 +02:00
MysticTempest d10f8944ed Fix blast_furnace fuel not being consumed at twice the rate. 2022-05-18 05:30:05 -05:00
PrairieWind 66cd32b6ff Merge pull request 'Blast Furnaces and Smokers' (#2210) from PrairieAstronomer/MineClone2:furnaces into master 
Reviewed-on: MineClone2/MineClone2#2210
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-17 22:20:23 +00:00
PrairieWind d93704fa0e Merge branch 'master' into furnaces 2022-05-17 18:33:20 +00:00
PrairieAstronomer fe36d579eb Add Blast Furnace and Smoker to Villager Workstations 2022-05-17 10:37:55 -06:00
PrairieAstronomer 4af0a4daae Updated GROUPS.md and fixed blast furnace group name. 2022-05-17 10:34:44 -06:00
PrairieAstronomer fd18c0d213 Removed Unneeded Code from Blast Furnace, and updated description. 2022-05-17 10:27:41 -06:00
PrairieAstronomer 7ac2593164 Removed Unneed code and fixed description of Smoker 2022-05-17 10:03:15 -06:00
PrairieAstronomer 29e18015b8 Make Fish and Salmon Smokable 2022-05-17 09:48:51 -06:00
PrairieAstronomer e1a6baffe9 Smoker 2022-05-16 21:11:10 -06:00
PrairieAstronomer f1a80876de Make Copper Ore Blastable 2022-05-16 20:59:19 -06:00
PrairieAstronomer 3558541648 Blast Furnace 2022-05-16 20:45:45 -06:00
cora 3a9812a2d7 Merge pull request 'Add a command to safely remove all mob objects' (#2098) from add_clearmombs_command into master 
Reviewed-on: MineClone2/MineClone2#2098
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-05-15 20:07:41 +00:00
cora 5282a63bcb add options for nametagged mobs and range 2022-05-15 20:04:09 +00:00
cora e5de4bba65 keep nametagged mobs, add "all" argument 2022-05-15 20:04:09 +00:00
cora 628686ce79 Add a command to safely remove all mob objects 2022-05-15 20:04:09 +00:00
cora abe419caf9 Merge pull request 'MISC/mcl_commands: Improve /seed command (now it looks like in modern MC) and update RU locale' (#2208) from rudzik8/MineClone2:commands-improve into master 
Reviewed-on: MineClone2/MineClone2#2208
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-15 19:38:47 +00:00
Mikita Wiśniewski 37e72e333b Improve /seed command (now it looks like in modern MC) and update RU locale 2022-05-15 20:27:30 +07:00
cora e322a9e23a Merge pull request 'Implement piston fixes:' (#2207) from redstone_piston_fixes into master 
Reviewed-on: MineClone2/MineClone2#2207
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-15 10:30:11 +00:00
MysticTempest dd1a58b01e Implement piston fixes: 
This enables the feature of unsticky pistons. This allows
for some nodes to be unpullable, but otherwise pushable or diggable.
A certain selection of nodes that can never be moved.
And, stops certain entities from being pushed if they shouldn't move.

Along with this change; I've also updated the rules regarding
pushing, and pulling of nodes & objects to be more accurate to MC.
Now allowing for more complex redstone circuits to be built.
 2022-05-15 02:18:21 -05:00
cora 87c9969801 Merge pull request 'Villager Workstations' (#2206) from PrairieAstronomer/MineClone2:villager_workstations_1 into master 
Reviewed-on: MineClone2/MineClone2#2206
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-14 22:21:47 +00:00
PrairieAstronomer fec5650711 Removed dependancies 2022-05-14 16:01:14 -06:00
PrairieAstronomer 5abfa555eb Added new workstations to villager jobsite definitions 2022-05-14 15:52:37 -06:00
PrairieAstronomer dead4069b0 Removed incorrect groups 2022-05-14 15:48:33 -06:00
PrairieAstronomer 4bc67a174b Loom 2022-05-14 15:34:08 -06:00
PrairieAstronomer c71b036e6a Cartography Table 2022-05-14 15:24:44 -06:00
PrairieAstronomer 046698c64f Fletching Table 2022-05-14 15:14:50 -06:00
cora e80eebd989 Merge pull request 'Update villager trades' (#2202) from villagers_update_2 into master 
Reviewed-on: MineClone2/MineClone2#2202
 2022-05-13 22:35:27 +00:00
cora 31b8ea26a2 add jobsites to professions table 2022-05-14 00:32:15 +02:00
cora fd6f2be485 update cleric trades 2022-05-14 00:32:15 +02:00
cora 07e0a90051 update tool smith trades 2022-05-14 00:32:15 +02:00
cora f073d4d420 update weapon smith trades 2022-05-14 00:32:15 +02:00
cora 89aaf6b709 update butcher trades 2022-05-14 00:32:15 +02:00
cora f09b578034 update leatherworker trades 2022-05-14 00:32:15 +02:00
cora 0ce1a92282 update armorer trades 2022-05-14 00:32:15 +02:00
cora 135ee97b21 update cartographer trades 2022-05-14 00:32:15 +02:00
cora 51cf92a909 update librarian trades 2022-05-14 00:32:15 +02:00
cora 2d47ad3e5f update fletcher trades 2022-05-14 00:32:15 +02:00
cora c28d700caf update fisherman trades 2022-05-14 00:32:15 +02:00
cora ba861d7b74 update farmer trades 2022-05-14 00:32:15 +02:00
cora 9b8b7ce6b4 refactor go home logic 2022-05-14 00:32:15 +02:00
cora 046b3a4ce2 Merge pull request 'enable simple mcl_mobs/mobs redo villager breeding' (#2204) from villager_breeding into master 
Reviewed-on: MineClone2/MineClone2#2204
 2022-05-13 22:31:15 +00:00
cora 354d17a14c enable simple villager breeding 2022-05-14 00:30:44 +02:00
cora 11265b60de Merge pull request 'Enable placing carpets on llamas and add textures for it' (#2201) from rudzik-llama-carpets into master 
Reviewed-on: MineClone2/MineClone2#2201
 2022-05-13 22:07:34 +00:00
Mikita Wiśniewski 7f3ba7d4a2 Enable placing carpets on llamas and add textures for it 2022-05-13 22:00:09 +00:00
cora 88e87bccff Merge pull request 'playerplus: fix deprecated add_player_velocity calls' (#2200) from fix-deprecated-add-vel into master 
Reviewed-on: MineClone2/MineClone2#2200
 2022-05-13 21:51:46 +00:00
cora a1209b14a1 playerplus: fix deprc. add_player_velocity calls 2022-05-12 23:30:39 +00:00
cora 729159f631 Merge pull request 'Refactor compass code.' (#2197) from get-compass-image-fix into master 
Reviewed-on: MineClone2/MineClone2#2197
Reviewed-by: cora <cora@noreply.git.minetest.land>
Reviewed-by: chmodsayshello <chmodsayshello@hotmail.com>
 2022-05-12 21:37:16 +00:00
kabou baf8e0b79c Update item entity for lodestone compass. 
* Added another special case to the item entity registration for
  lodestone compasses, without this a dropped lodestone compass would
  turn into a regular compass on being dropped.
* Update the compass and lodestone compass frame number to be the
  stereotype frame.
 2022-05-12 21:08:52 +02:00
chmodsayshello 00dba67cd8 remove lodestone compass from creative inventory 2022-05-12 19:06:13 +02:00
kabou 872b708465 Remove unused variable. 
* Removed unused variable `stack_max`.
 2022-05-11 21:45:15 +02:00
kabou 74e70b674e Fix return value of `get_compass_image()`. 
* `get_compass_image()` did not actually return the image number.
 2022-05-11 21:43:52 +02:00
kabou 14c882f982 Fix lodestone compass meta handling. 
* The nature of a compass was being determined by looking at its meta.
  This caused lodestone compasses with unset meta to turn into regular
  compasses.  Fixed by using string matching on the itemname.
* Changed lodestone rightclick handler to explicitly set the correct
  name and frame of the compass used on it instead of waiting for
  globalstep to do this.
 2022-05-11 21:31:50 +02:00
kabou 8ae605165b Fix lodestone compass stack_max. 
* Lodestone compasses are stackable.
* Remove hardcoded `stack_max` setting, use default.
 2022-05-11 17:53:41 +02:00
kabou aca4aca79b Add German translation. 
* Add "de" (German) translation by chmodsayshello.
 2022-05-11 17:43:57 +02:00
kabou bacc7613b5 Fix crash in mt 5.4 with vector ops. 
* `vector.from_string()` is not available in mt pre-5.5.  Replace with
  `minetest.string_to_pos()`.
 2022-05-11 17:41:10 +02:00
kabou 8a4b8707fa Add new compass API. 
* Add API.md
* Update mcl_itemframes to use the new API.
* Revert old exported function back to original API.
 2022-05-10 23:38:28 +02:00
kabou a8c231da34 Refactor compass code. 
* Split up `get_compass_image()` into smaller functions.  This allows
  for better code sharing between old and new API and globalstep fn.
* Add `get_compass_itemname()` function.  It will be the new API of
  choice, `get_compass_image() will be deprecated soon.
* Remove function declaration out of globalstep function.
* Various other performance improvements.
* Add local aliases for global functions
* Lodestone compasses can only stack 1 item.
* Document functions and variables.
* Fix lodetone compass inaccurately reusing compass descriptions.
* Add usage descriptions to node definitions
* Refactor craftitem registration code.
* Update translation templates.
 2022-05-10 22:43:03 +02:00
cora 4d342b8365 Merge pull request 'Village(r)s update' (#2189) from villager_spawning into master 
Reviewed-on: MineClone2/MineClone2#2189
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
 2022-05-09 22:01:25 +00:00
cora 12a943e222 Make villagers homeless when bed is gone on return 2022-05-09 10:29:58 +00:00
cora 8d0afede37 don't block mapgen on village generation 2022-05-09 10:29:57 +00:00
cora 0288581407 increase wait til village generated 2022-05-09 10:29:57 +00:00
cora 3774044f86 Walk back to bed instead of teleporting 2022-05-09 10:29:57 +00:00
cora 46dbf8c0ab Spawn villagers on villagegen, stay in village 
This spawns a villager per bed on village gen and saves the bed
position in the entity. If it moves too far from the village
it gets teleported (for now) back.
 2022-05-09 10:29:57 +00:00
cora 7c263c6a18 Merge pull request 'Potion Fixes:' (#2191) from Fix_waterbreathing_and_potion_icons into master 
Reviewed-on: MineClone2/MineClone2#2191
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-09 10:25:51 +00:00
MysticTempest 44b1d583a7 Potion Fixes: 
Ensure all potion icons disappear after their effect is gone.
Stop Breath bar from flashing when water_breathing is in effect.
 2022-05-09 05:18:59 -05:00
cora 1565999134 Merge pull request 'fix the 2nd nether dust warning' (#2190) from fix_weather_warning_2 into master 
Reviewed-on: MineClone2/MineClone2#2190
 2022-05-09 10:09:18 +00:00
cora 5a25e42fd3 fix the 2nd nether dust warning ^^ 2022-05-09 12:06:28 +02:00
cora 421995deb3 Merge pull request 'Fix list of spawnable biomes for rabbits.' (#2187) from rabbit_spawn_fix into master 
Reviewed-on: MineClone2/MineClone2#2187
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-08 20:01:56 +00:00
kabou 4e3a2a7b4c Fix list of spawnable biomes for rabbits. 
* Rabbits spawn in Desert biome.
* Rabbits do no spawn in Forest and Swamp biomes.
 2022-05-08 19:59:04 +00:00
cora e8e565fc06 Merge pull request 'Add Respawn Anchor (PR with branch in mcl2 repo)' (#2188) from respawn_anchor into master 
Reviewed-on: MineClone2/MineClone2#2188
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-05-08 19:57:43 +00:00
chmodsayshello 6cb08a3c87 update dependencies 2022-05-08 19:57:09 +00:00
chmodsayshello 31a8ddabb8 minor changed (see long description) 
This commit makes charged respawn anchors light sources, all respawn anchors can no longer be pushed by pistons and always drop the uncharged one
 2022-05-08 19:57:09 +00:00
chmodsayshello 6806ea311d code from inital PR 2022-05-08 19:57:09 +00:00
cora ea2b53b231 Merge pull request 'Adopt mob spawning from mcl5' (#2120) from mcl5-spawning into master 
Reviewed-on: MineClone2/MineClone2#2120
 2022-05-08 19:48:36 +00:00
cora e1ed990f58 sp. farm animals on grass, villagers near beds 2022-05-08 18:50:37 +00:00
cora e4c5f81524 make husks spawn only in deserts, zombies not 2022-05-08 18:50:37 +00:00
kay27 53042b6f48 Adopt mob spawning from mcl5 2022-05-08 18:50:37 +00:00
cora fbe048087f Merge pull request 'Add wither spawning by EliasFleckenstein03' (#2146) from wither_spawning into master 
Reviewed-on: MineClone2/MineClone2#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: MineClone2/MineClone2#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: MineClone2/MineClone2#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
1F616EMO 6c36c83a18 AMethyst Growing 2022-05-05 22:49:23 +02:00
1F616EMO 48a4e069f9 craft bugfix 2022-05-05 22:49:23 +02:00
1F616EMO 60e04438e0 typo missing space 2022-05-05 22:49:23 +02:00
1F616EMO 0b01d299ea 更新 'mods/ITEMS/mcl_amethyst/init.lua' 2022-05-05 22:49:23 +02:00
1F616EMO ebdf944dda amethyst bud 2022-05-05 22:49:23 +02:00
1F616EMO 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: MineClone2/MineClone2#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: MineClone2/MineClone2#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: 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