Commit Graph

7355 Commits

Author SHA1 Message Date
kay27 77ac660c7b Merge remote-tracking branch 'mcl2/master' into testing 2022-01-02 03:12:55 +04:00
kay27 b4fa82d2ab Merge remote-tracking branch 'origin/master' into testing 2022-01-02 03:11:52 +04:00
kay27 7ecf316c48 #55 Fix boat visual size again 2022-01-02 03:11:10 +04:00
NO11 cbf497e68b Merge branch 'master' into arrow_fix 2022-01-01 23:01:01 +00:00
NO11 53860a8f79 Remove arrow entities when the player joins to prevent killing on startup (working fix) 2022-01-01 23:00:02 +00:00
NO11 7b46225176 Remove arrow entities when the player joins to prevent killing on startup (working fix) 2022-01-01 22:59:21 +00:00
chmodsayshello cdab29a42e replaced old itemstring 2022-01-01 13:52:38 +00:00
chmodsayshello fa892e880e removed the code I used during debugging
Now, suspicious stews are no longer in the creative inventory, and have to be crafted or obtained using /giveme
2022-01-01 12:23:13 +00:00
chmodsayshello a03e532a85 upload the texture for the suspicious stew 2022-01-01 12:19:50 +00:00
chmodsayshello 4a2b07115a added new dependencies (everything required is within mineclone5) 2022-01-01 12:18:29 +00:00
chmodsayshello c263d1a622 registered suspicious_stew.lua within mcl_mushrooms 2022-01-01 12:17:29 +00:00
chmodsayshello b6567ee11c upload the code for the suspicious stew(s) 2022-01-01 12:15:04 +00:00
kay27 cd3f9bc40f Merge master into testing 2021-12-31 02:34:34 +04:00
kay27 b2df02a4d2 Merge pull request 'loaded crossbows are no longer in creative inventory' (#60) from chmodsayshello/MineClone5:crosbow_inventory_fix into master
Reviewed-on: MineClone5/MineClone5#60
2021-12-30 22:33:16 +00:00
NO11 263bb1607d Remove arrow entities when the player leaves to prevent killing on startup 2021-12-30 13:12:19 +00:00
NO411 7b47a15e34 Remove arrow entities when the player leaves to prevent killing on startup 2021-12-30 14:04:53 +01:00
chmodsayshello 2dbd01b8a0 loaded crossbows are no lomger in creative inventory
In Minecraft, loaded crossbows are NOT in the creative inventory!

https://minecraft.fandom.com/wiki/Crossbow
2021-12-26 09:47:30 +00:00
chmodsayshello 6ee11337f4 Merge pull request 'Update Fork Branch' (#2) from master into golemfix
Reviewed-on: #2
2021-12-25 21:23:03 +00:00
chmodsayshello d40ea5855b Snow Golems no longer drop experience orbs
In Minecraft, (Snow) Golems do not drop any xp! (checked in the Minecarft Wiki and confirmed in my copy of Minecraft (1.18.1))
Now they drop at least 0 and at most 0 experience orbs, so you won't get any

https://minecraft.fandom.com/wiki/Snow_Golem
2021-12-25 21:14:20 +00:00
chmodsayshello 54de60b27e Iron Golems no longer drop experience orbs
In Minecraft, (Iron) Golems do not drop any xp! (checked in the Minecarft Wiki and confirmed in my copy of Minecraft (1.18.1))
Now they drop at least 0 and at most 0 experience orbs, so you won't get any

https://minecraft.fandom.com/wiki/Iron_Golem
2021-12-25 21:11:01 +00:00
kay27 e7e8d394ed #55 Rewrite boat get_visual_size in a bit safer way 2021-12-25 04:49:12 +04:00
AFCMS a7e471de62 framed stained glass 2021-12-23 18:02:43 +01:00
AFCMS 12830781f8 Merge branch 'master' into connected_glass 2021-12-23 17:29:53 +01:00
Lizzy Fleckenstein bfd1fd69d1
Fix potential crash when falling onto unknown node 2021-12-19 18:59:09 +01:00
kay27 315ed0e72c Add dummy trident texture 2021-12-17 03:33:36 +04:00
kay27 21f305e33a Add minor anticheat fixes 2021-12-17 03:19:24 +04:00
kay27 9d77c22c4f Fix light 2021-12-17 03:04:36 +04:00
kay27 d547e435bb Try to disable suffocating bombs (Hi again Mr_Anderson) 2021-12-16 07:09:56 +04:00
kay27 a3fb5c6164 Try to disable flights in Survival Mode (Hi Mr_Anderson) 2021-12-16 05:52:50 +04:00
cora cce6b9f6e2 Merge imporved Nether dust by cora 2021-12-15 04:33:03 +04:00
kay27 59fa6a91e9 Fix light_source level 1 2021-12-15 04:23:11 +04:00
kay27 3a402c8054 Fix minor ambient light issues 2021-12-15 04:20:34 +04:00
kay27 6747a199ae Set minimum light level to 1 for all nodes by adopting ambience_light mod - much more MC-like 2021-12-13 02:09:03 +04:00
Lizzy Fleckenstein e2360204a7
Revert "fixed daylightsensor's register_abms"
This reverts commit 5a4abcbcb7.
2021-12-12 15:55:52 +01:00
kay27 5f069ae360 Add mcl_tridents mod by j45 2021-12-11 03:35:42 +04:00
kay27 512042d8d6 Update mcl_bubble_column mod by j45 2021-12-11 03:13:45 +04:00
chmodsayshello 5a4abcbcb7 fixed daylightsensor's register_abms
By changing the check if a normal/inverted daylightsensor should update by turning on and off, I made them workling again
2021-12-10 13:59:31 +00:00
kay27 6797466a81 Merge pull request 'Merge daylight sensors fix' (#49) from master into testing
Reviewed-on: MineClone5/MineClone5#49
2021-12-10 00:03:01 +00:00
kay27 361314e7a6 Merge pull request 'Fixed daylightsensors' (#45) from chmodsayshello/MineClone5:daylightsensor_fix into master
Reviewed-on: MineClone5/MineClone5#45
2021-12-09 23:57:44 +00:00
kay27 d9cec19d62 #48 Localize add_entity 2021-12-10 03:55:45 +04:00
kay27 0c8e5dc7a4 Disable Nether portal node rotation by screwdriver 2021-12-10 03:52:14 +04:00
kay27 06b482b309 Merge remote-tracking branch 'mcl2/master' into testing 2021-12-10 03:47:25 +04:00
kay27 5d73d69a82 #48 Fix lightning crash 2021-12-10 03:46:24 +04:00
Lizzy Fleckenstein e4feb233e0
Fix hopper dupe 2021-12-09 18:20:24 +01:00
Lizzy Fleckenstein b945975427
Slime splitting: nil check child to prevent crash (that happened on oysterity-mcl2) 2021-12-09 18:11:05 +01:00
kay27 6db7984cdd Merge branch 'testing' of https://git.minetest.land/MineClone5/MineClone5 into testing 2021-12-09 03:07:30 +04:00
kay27 ea6d8f9e86 Merge remote-tracking branch 'mcl2/master' into testing 2021-12-09 03:07:00 +04:00
kay27 5ea16cd4f0 Disable Nether portal node rotation by screwdriver 2021-12-09 02:55:57 +04:00
chmodsayshello c0e4065e33 „mods/ITEMS/REDSTONE/mesecons_solarpanel/init.lua“ ändern 2021-12-08 18:04:43 +00:00
kay27 543d695e44 Merge pull request '#41 Remove proprietary textures, update game screenshot' (#43) from master into production
Reviewed-on: MineClone5/MineClone5#43
2021-12-08 15:03:48 +00:00
kay27 654f608909 #41 Remove proprietary textures, update game screenshot 2021-12-08 18:59:00 +04:00
kay27 c41e2f8d13 Merge pull request 'Release MineClone 5 0.71.7' (#40) from testing into production
Tested on kay27.ignorelist.com - basics work fine, releasing
2021-12-08 01:59:23 +00:00
Lizzy Fleckenstein 0e9a56fa35
Add stacks to enchant_uniform_randomly 2021-12-07 18:19:41 +01:00
Lizzy Fleckenstein ec7e245b9d
Various fixes to the enchanting and loot system
- enchanted loot generated by mapgen now uses PseudoRandom for randomness
- prevent fishing loot from generating loot 32767 times (!!!) when only 1 is needed
- bows and fishing rods obtained from the treasure section of fishing loot are now enchanted
- there is now a function to uniform enchant items other than books
2021-12-07 17:57:18 +01:00
Lizzy Fleckenstein b3958a956d
Refactor random enchantment selection code 2021-12-07 16:16:07 +01:00
Lizzy Fleckenstein 882db9f873
Remove unused and completely unlogical enchantment_level paramenter from get_possible_enchantments 2021-12-07 15:49:12 +01:00
Lizzy Fleckenstein 261faafb7c
Fix get_possible_enchantments to not return incompatible enchantments, even if treasure enchantments are allowed 2021-12-07 15:47:23 +01:00
kay27 93da5d3f77 Merge MineClone2/master 2021-12-05 05:10:29 +04:00
kay27 3268a94b20 Merge remote-tracking branch 'origin/master' into testing 2021-12-05 04:31:17 +04:00
Lizzy Fleckenstein 92686e5412
Fix broken mcl_util.calculate_durability 2021-12-02 17:28:19 +01:00
Lizzy Fleckenstein e6b200aaf3
Fix access to ender inventory without an ender chest 2021-12-02 16:19:59 +01:00
Lizzy Fleckenstein d3015edeb9
Fix reference dupes for droppers and dispensers 2021-11-29 19:12:49 +01:00
Glaucos Ginez 9edf277905 Fix mobs spawn count 2021-11-21 22:13:24 -03:00
Nils Dagsson Moskopp 46394e7e1f
Add obsidian boat that always sinks 2021-11-20 09:06:48 +01:00
Lizzy Fleckenstein b0aceae73d
Fix reference dupe glitches 2021-11-19 15:22:40 +01:00
NO11 9200c3fe44 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-11-18 17:42:19 +01:00
NO11 903d1777be Use set_count instead of creating a new item and checking for enchanted books 2021-11-18 17:40:32 +01:00
Lizzy Fleckenstein 6ca5799565
Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-11-17 18:25:19 +01:00
Lizzy Fleckenstein 30528b0a2c
Fix crash when opening a chest with an unknown node on top 2021-11-17 18:25:12 +01:00
NO11 9919011aca Fix enchanted books losing their enchantments in creative inventory 2021-11-17 16:43:48 +01:00
NO11 c757e98b4f Fix #1911, error in lightning callback 2021-11-17 00:37:11 +01:00
NO11 a9804879e2 Rename drippingwater to mcl_dripping in mod.conf and readme.txt 2021-11-15 21:54:16 +01:00
NO11 d2a03ec0b9 Rename entity ids 2021-11-15 21:44:23 +01:00
NO11 7ef6613f09 Rename drippingwater mod to mcl_dripping 2021-11-15 21:39:43 +01:00
NO11 d27109d807 Merge branch 'master' into dripping 2021-11-13 19:15:49 +00:00
NO11 fdaaf0ec49 Use on_joinplayer instead of on_newplayer 2021-11-13 18:56:52 +00:00
NO11 add97d39a6 delete overlay texture 2021-11-13 17:28:13 +00:00
NO11 bcb6251d20 Use label instead of extra texture 2021-11-13 17:26:17 +00:00
NO11 1483c45cc9 Merge branch 'master' into inventory 2021-11-13 15:28:13 +00:00
NO11 642b9db035 localize wielditem in crossbow.lua (Fix #1901) 2021-11-13 15:19:34 +00:00
NO11 d7e59f6a35 Add switch stack size overlay texture 2021-11-13 12:26:01 +00:00
NO11 d4da855570 Add button to switch between max stack size and just one item 2021-11-13 12:25:10 +00:00
NO11 30dd505985 Merge branch 'master' into inventory 2021-11-13 11:18:47 +00:00
NO11 ae8068cca6 Use stack_max instead of 64 for all items 2021-11-13 11:17:46 +00:00
iliekprogrammar bd14918543
Reduce defuse reach for charged creeper
5.2 is actually half of the estimated MC creeper defuse range, which is 10.4.
The reason for this change is to balance the creeper in MCL2 where it fuses
whilst moving making it more difficult than MC. In MC, the creeper does not move
while fusing.
2021-11-13 12:12:20 +08:00
iliekprogrammar 66c1b4a95f Merge pull request 'fix_creeper' (#1896) from Dieter44/MineClone2:fix_creeper into master
Reviewed-on: MineClone2/MineClone2#1896
2021-11-13 04:06:55 +00:00
iliekprogrammar 96c4fb60d8
Fix crash on startup during immediate runtime by mcl_burning
The crash occurs if mcl_burning:data is deserialized to nil. The cause of
mcl_burning being set to "return nil" is unknown. Therefore, when it occurs, it
will be logged as warning.
2021-11-13 10:55:24 +08:00
NO11 5515e2baa1 Add 64 items to inventory when creative is on 2021-11-12 21:49:47 +00:00
NO11 7ed964756e local luaentity 2021-11-12 18:00:04 +00:00
NO11 0e5ad8637d Merge branch 'master' into dripping 2021-11-12 17:54:30 +00:00
NO11 0cc0a7e01d Make dripping particles MC-like 2021-11-12 17:49:27 +00:00
NO11 490e40d042 Bone meal particles: add some velocity, correct glow 2021-11-12 15:41:09 +00:00
NO11 9e4e7f0695 Merge branch 'master' into bone_meal 2021-11-12 15:02:13 +00:00
NO11 2a08f31435 Use particlespawners for better performance (sponge particles) 2021-11-12 14:09:59 +00:00
iliekprogrammar 0564121183
Code style for #1890 2021-11-12 02:36:17 +08:00
iliekprogrammar bca5033fb2 Merge pull request 'Implement health regeneration correctly' (#1890) from Dieter44/MineClone2:fixHealthRegen into master
Reviewed-on: MineClone2/MineClone2#1890
2021-11-11 18:33:57 +00:00
Dieter44 03d22852ee Replace mobs:boom with equivalent mcl_explosions.exlode() to fix game crash when creeper is right-clicked with flint and steel. Issue #1753 2021-11-11 16:56:44 +01:00
Dieter44 10a5f8c4bf Adding attribute hostile=true to charged creeper to fix that the charged creeper has no behavior: Issue #1756 2021-11-11 16:50:29 +01:00
Dieter44 68810a2a74 Change creeper fuse range and defuse range according to minecraft wiki: https://minecraft.fandom.com/wiki/Creeper and: https://minecraft.fandom.com/wiki/Explosion. Fix of #1689 2021-11-11 16:47:32 +01:00
Dieter44 0b6467d679 Reduce creeper run_velocity to 2.1, to fix #1691 2021-11-11 16:03:04 +01:00
NO11 8979230c42 Several fixes for applying bone meal to grass 2021-11-10 17:15:27 +00:00
iliekprogrammar f61143758e
Fix small typo in API.md 2021-11-10 12:54:28 +08:00
iliekprogrammar fa22ec4dd0
Add helper functions to update/merge tables. 2021-11-10 02:50:49 +08:00
Dieter44 017bf705e9 Fixing that player can regenerate health in death screen and then respawn without HP being set to maximum 2021-11-09 19:35:32 +01:00
Lizzy Fleckenstein a7bc460fae
Fix boat and enchanting book texture glitches / warnings 2021-11-09 17:39:39 +01:00
Dieter44 e82d21040c minor changes, ipairs() replaced with pairs() 2021-11-08 19:15:56 +01:00
Dieter44 2f05388541 Add one food_tick_timer per player instead of using one for all players. 2021-11-08 15:49:05 +01:00
Dieter44 976f522b9d Combine slowFoodTickTimer and fastFoodTickTimer to a single food_tick_timer 2021-11-08 15:33:53 +01:00
NO11 51dffc6c53 Merge branch 'master' into bone_meal 2021-11-08 13:16:39 +00:00
NO11 30ce6f8a77 Fix typo min -> max 2021-11-08 13:16:20 +00:00
Lizzy Fleckenstein a410a7fabe Merge pull request 'Add OpenCollective link and credits' (#1893) from EliasFleckenstein03/MineClone2:opencollective into master
Reviewed-on: MineClone2/MineClone2#1893
2021-11-08 11:48:10 +00:00
Lizzy Fleckenstein ea46c8741b
Add OpenCollective link and credits 2021-11-07 20:29:11 +01:00
NO11 5b52deaa8a Merge branch 'master' into bone_meal 2021-11-06 13:38:20 +00:00
NO11 7bbc1e9951 Add API.md for bone meal API 2021-11-06 13:34:22 +00:00
Lizzy Fleckenstein 0dd780ee2a Merge pull request 'Implement grass palette conversion, Add sugar cane colorisation' (#1889) from EliasFleckenstein03/MineClone2:tint into master
Reviewed-on: MineClone2/MineClone2#1889
2021-11-06 13:29:39 +00:00
NO11 1b259f928b Add simple bone meal API
- callback api
- particle api
2021-11-06 13:12:03 +00:00
Dieter44 d0d60804a3 Implemented health regeneration mechanics as described in minecraft wiki. Saturation values and different regeneration speeds now used. 2021-11-04 21:01:28 +01:00
Dieter44 d1d11f9740 Fixed debug hudbars for player saturation and exhaustion when mcl_hunger_debug=true is set in .config file 2021-11-04 20:58:54 +01:00
Nils Dagsson Moskopp 4926c0560d
Speed up TGA encoding by creating fewer strings 2021-11-04 15:38:56 +01:00
Nils Dagsson Moskopp 23ca11c8e1
Use RLE compression in tga_encoder 2021-11-04 15:38:26 +01:00
Elias Fleckenstein 88e084cbca Merge pull request 'Rework XP API' (#1888) from EliasFleckenstein03/MineClone2:xp into master
Reviewed-on: MineClone2/MineClone2#1888
2021-11-04 13:36:13 +00:00
iliekprogrammar f4803a35c4 Merge pull request 'Update contribution guidelines' (#1881) from EliasFleckenstein03/MineClone2:guidelines into master
Reviewed-on: MineClone2/MineClone2#1881
2021-11-04 12:06:32 +00:00
Lizzy Fleckenstein 25f467c8ab
Merge branch 'master' into xp 2021-11-03 20:18:49 +01:00
Elias Fleckenstein c17fc81d1f Merge pull request 'Break minecart if it's near a cactus' (#1886) from NO11/MineClone2:minecart into master
Reviewed-on: MineClone2/MineClone2#1886
2021-11-03 19:18:01 +00:00
Lizzy Fleckenstein 8f9f5cc936
Merge branch 'master' into xp 2021-11-03 20:14:08 +01:00
Lizzy Fleckenstein 643ded06da
Merge branch 'master' into guidelines 2021-11-03 20:04:08 +01:00
Lizzy Fleckenstein 970988cb39
Add sugar cane colorisation 2021-11-03 19:58:50 +01:00
Lizzy Fleckenstein 34f329a9d5
TextureConverter: Implement grass palette conversion
Source: https://minecraft.fandom.com/wiki/Tint
Since the MineClone2 biomes do not entirely match with the Minecraft ones I picked the Minecraft biomes that seem to match them best.
This also changes the palette index of the nether to match the desert instead of the mesa biome
and changes the color of grass blocks in item form to the default minecraft one.
2021-11-03 19:57:21 +01:00
Lizzy Fleckenstein a4e73886d5
Rework XP API 2021-11-03 19:36:57 +01:00
Lizzy Fleckenstein 148575a05b
Remove unused hud_manager.hud_exists function 2021-11-03 16:28:13 +01:00
Artem Arbatsky db696d0e2b
Add missing call for on_die function 2021-11-03 10:11:06 +08:00
NO11 f09923ded9 Merge branch 'master' into minecart 2021-11-02 22:01:54 +00:00
NO11 c52fda154b Break minecart if it's near a cactus (Fix #924) 2021-11-02 22:58:03 +01:00
NO11 4e0bb0d120 Merge branch 'master' into inventory 2021-10-28 09:47:39 +00:00
NO11 5b37f56005 Remove small gray border of buttons in creative inventory pages 2021-10-28 09:43:14 +00:00
NO11 6025a3d7d4 Merge branch 'master' into totem_particles 2021-10-28 09:06:09 +00:00
NO11 19689dd857 Use enchanted golden apple for thing banner 2021-10-26 16:50:10 +00:00
NO11 b78e7b3e4d Merge branch 'master' into totem_particles 2021-10-26 14:48:07 +00:00
Lizzy Fleckenstein 797da20fa7
Add script to automatically generate ingame credits from CREDITS.md 2021-10-26 13:08:07 +02:00
Lizzy Fleckenstein 30f7c638f3
mcl_enchanting: Add spanish translations and update template
Credit to: todoporlalibertad <todoporlalibertad@riseup.net>
Reviewed by j45
2021-10-25 22:55:48 +02:00
NO11 eccba76732 Use math.floor instead of math.round 2021-10-25 20:25:34 +00:00
NO11 6d22262c53 Merge branch 'master' into totem_particles 2021-10-25 17:09:24 +00:00
NO11 7489010152 Use particlespawners instead of single particles 2021-10-25 17:08:38 +00:00
NO11 dafe860e56 simple totem particles 2021-10-24 19:31:51 +00:00
epCode 1c458a2e72 Add crossbows 2021-10-15 12:00:37 -07:00
NO11 9ccf8de606 Fix crash on startup if mcl_playersSleepingPercentage is not defined (#1874) 2021-10-09 14:41:56 +00:00
NO11 19b5a5aac7 Merge pull request 'Add playersSleepingPercentage server setting (Fix #920)' (#1861) from NO11/MineClone2:beds into master
Reviewed-on: MineClone2/MineClone2#1861
2021-10-07 15:14:03 +00:00
NO11 6803d22dbd Merge pull request 'Give players fly priv when creative is enabled' (#1865) from NO11/MineClone2:privs into master
Reviewed-on: MineClone2/MineClone2#1865
2021-10-07 15:13:04 +00:00
NO11 0584d16569 add lightning API support for mobs 2021-10-05 04:15:48 +00:00
NO11 03829dd518 fix typo 2021-10-05 04:15:48 +00:00