atomdmac
/
MineClone5
forked from MineClone5/MineClone5
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,197 Commits 32 Branches 24 Tags 71 MiB
Commit Graph

3711 Commits

Author SHA1 Message Date
kay27 89769b8168 Fix Nether portal in End 2022-01-19 04:11:29 +04:00
kay27 a36f3ba7d0 Cleanup again 2022-01-19 04:09:19 +04:00
kay27 5c27e1c186 Merge master into mapgen_issue 2022-01-18 19:18:04 +04:00
kay27 30a0eb1d4a Restore nether_portal in spawnstruct list 2022-01-17 20:03:46 +04:00
kay27 66fded90d5 Fix vines 2022-01-17 03:25:47 +04:00
kay27 fefa9c8b4f Initialize temples 2022-01-16 06:42:18 +04:00
kay27 6d4f7d2e62 Fix strongholds 2022-01-16 05:20:34 +04:00
kay27 c6754fd39e Start adding new structures API 2022-01-12 03:27:28 +04:00
GuyLiner 26cc290342 Merge branch 'testing' into break_range_fix 2022-01-11 21:44:01 +00:00
Guy Liner 8a7db3de9a Breaking range parity with Minecraft: Java Edition 2022-01-11 16:40:50 -05:00
kay27 1f55e6da1c Merge remote-tracking branch 'origin/spawner' into testing 2022-01-11 21:56:47 +04:00
kay27 749bc379e7 Merge MineClone 2/master into testing 2022-01-11 21:52:45 +04:00
Guy Liner bc3ecb175e Merge remote-tracking branch 'spawner/spawner' into spawner 
These are my changes that fix a spawning bug that allowed monsters
to spawn no matter what light level if you had manually created
the spawner
 2022-01-11 09:24:19 -05:00
kay27 dd5803908b #110 Add trident model by epCode 2022-01-10 19:49:18 +04:00
Daniel Cassidy d0d7ebe53b Really move mcl_stairs_stone_slab_top.png into mcl_core 
This is a fix for #105 where I accidentally moved it to the wrong place.
Sorry.

mcl_core uses this texture for Polished Stone (mcl_core:stone_smooth),
which means mcl_core had an undeclared dependency on mcl_stairs.

Since mcl_stairs depends on mcl_core, it makes sense to move the texture
to mcl_core.
 2022-01-07 21:56:37 +00:00
kay27 7868cf7dc5 Merge master into mapgen_issue 2022-01-07 06:47:11 +04:00
Guy Liner 04a81af4a1 Make sure that the player is not in creative mode before giving them experience points 2022-01-05 10:42:50 -05:00
kay27 fc3dc63f01 Merge pull request 'Move texture mcl_stairs_stone_slab_top to mcl_core.' (#105) from djc/MineClone5:polished-stone into master 
Reviewed-on: MineClone5/MineClone5#105
 2022-01-05 03:05:20 +00:00
Daniel Cassidy af03b030a0 Move texture mcl_stairs_stone_slab_top to mcl_core. 
mcl_core uses this texture for Polished Stone (mcl_core:stone_smooth),
which means mcl_core has an undeclared dependency on mcl_stairs.

Since mcl_stairs depends on mcl_core, it makes sense to move the texture
to mcl_core.
 2022-01-05 02:33:31 +00:00
kay27 4ce3102ab4 Merge remote-tracking branch 'origin/testing' into mapgen_issue 2022-01-05 04:18:39 +04:00
Daniel Cassidy 841c278490 mcl_enchanting: Add missing dependency on mcl_experience. 2022-01-04 23:46:54 +00:00
kay27 91fd78f38f Merge branch 'master' into mapgen_issue 2022-01-04 00:43:52 +04:00
kay27 7464a4721d Merge remote-tracking branch 'origin/production' 2022-01-03 20:15:42 +04:00
kay27 bcb93fb49c Merge master into mapgen_issue 2022-01-03 20:12:50 +04:00
kay27 698c29733f #38 Fix cauldrons 2022-01-03 07:42:33 +04:00
kay27 6a323c376a Merge pull request 'Merge 0.71.12 into master' (#79) from production into master 
Reviewed-on: MineClone5/MineClone5#79
 2022-01-02 13:47:59 +00:00
NO11 627c37cd97 Fix pumpkin hud 2022-01-02 12:37:20 +00:00
NO11 8c6d016527 Make removing of arrow entities also work with mobs, remove arrows on respawn 2022-01-02 11:07:43 +00:00
NO11 7cc7fb1331 Make removing of arrow entities also work with mobs, remove arrows on respawn 2022-01-02 11:06:29 +00:00
kay27 9b4cbb6cda Merge branch 'master' into testing 2022-01-02 12:03:32 +04:00
kay27 9e8d02413e Merge pull request 'Added Suspicious Stews (New Pull Request)' (#67) from chmodsayshello/MineClone5:SuspiciousStew2 into master 
Reviewed-on: MineClone5/MineClone5#67
 2022-01-02 07:57:31 +00:00
kay27 c2256bc4b7 Revert solar panel revert from MCL2 - more testing needed 2022-01-02 03:16:05 +04:00
kay27 77ac660c7b Merge remote-tracking branch 'mcl2/master' into testing 2022-01-02 03:12:55 +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 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
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
kay27 315ed0e72c Add dummy trident texture 2021-12-17 03:33:36 +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
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 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
Lizzy Fleckenstein e4feb233e0
Fix hopper dupe 2021-12-09 18:20:24 +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 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 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
Lizzy Fleckenstein b0aceae73d
Fix reference dupe glitches 2021-11-19 15:22:40 +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 642b9db035 localize wielditem in crossbow.lua (Fix #1901) 2021-11-13 15:19:34 +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
NO11 8979230c42 Several fixes for applying bone meal to grass 2021-11-10 17:15:27 +00:00
Lizzy Fleckenstein a7bc460fae
Fix boat and enchanting book texture glitches / warnings 2021-11-09 17:39:39 +01:00
NO11 30ce6f8a77 Fix typo min -> max 2021-11-08 13:16:20 +00: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
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
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 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