programmerjake
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
6,764 Commits 67 Branches 76 Tags 166 MiB
Commit Graph

3087 Commits

Author SHA1 Message Date
Lizzy Fleckenstein 7f28f4a9d1 Merge branch 'master' into mineclone5 2021-04-14 18:16:24 +02:00
Lizzy Fleckenstein c41bd3932c Add global smoke spawning API 2021-04-14 18:14:21 +02:00
Code-Sploit d3dd6559a2 Add correct durability for netherite sword 2021-04-14 13:12:44 +00:00
Code-Sploit 464216ea0a Fix crash in netherite hoe by adding netherite to uses{} 2021-04-14 13:10:07 +00:00
Code-Sploit 5c9a78bea7 Add netherite hoe texture 2021-04-14 13:08:31 +00:00
Code-Sploit 7d22906f34 Add netherite tools 2021-04-14 13:07:25 +00:00
Code-Sploit 1247bcc039 Add: Netherite scrap, Netherite ingot. Add crafting recipe for netherite ingot. 2021-04-14 12:35:15 +00:00
Code-Sploit 93df51b223 Add ancient debris 2021-04-14 12:20:53 +00:00
Code-Sploit 7e7a635ed0 Add correct durability for netherite armor 2021-04-14 11:57:46 +00:00
Code-Sploit 35d2ef52c1 Add correct textures for netherite armor 2021-04-14 11:54:42 +00:00
Code-Sploit a3ef3737d5 Remove invalid placed texture images 2021-04-14 11:52:23 +00:00
Code-Sploit e1236d7547 Add second part of netherite armor textures 2021-04-14 11:46:34 +00:00
Code-Sploit 7a6929f4cb Add first part of netherite armor textures 2021-04-14 11:44:50 +00:00
Code-Sploit bc23cd800e Add code for netherite armor 2021-04-14 11:42:28 +00:00
epCode 5b93ee5e40 Improve rocket 2021-04-13 17:07:28 -07:00
kay27 7fa0767b13 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-14 01:18:34 +04:00
NO11 1c50f9aed6 fix typo 2021-04-13 20:52:55 +00:00
NO11 f768972469 add rocket texture (pixel perfection) 2021-04-13 20:38:00 +00:00
NO11 9c68528b8b add german translation 2021-04-13 20:36:41 +00:00
NO11 1597e093b5 Dateien hochladen nach „mods/ITEMS/mcl_fireworks/sounds“ 2021-04-13 20:35:40 +00:00
NO11 f15a28109c add rocket for elytra boost 2021-04-13 20:33:34 +00:00
Code-Sploit cd0d2d2296 Fix #1548 2021-04-13 13:57:45 +00:00
kay27 3077498a63 Fix screwdriver/door duplication glitch, MineClone2/MineClone2#1149 2021-04-13 16:49:10 +04:00
Lizzy Fleckenstein b340a3586d Make mcl_backstone use the new mcl_torches API for soul torches instead of overwriting it 2021-04-13 10:05:22 +02:00
Lizzy Fleckenstein 78d387e2df Rewrite mcl_torches API 2021-04-13 09:59:51 +02:00
Lizzy Fleckenstein 944a6325d0 Rewrite mcl_torches API 2021-04-13 09:59:32 +02:00
Lizzy Fleckenstein 89c4720de1 Fix warning with leafdecay_distance 2021-04-13 08:53:22 +02:00
Lizzy Fleckenstein 9ce4cd1281 Fix fire_enabled warning 2021-04-13 08:50:50 +02:00
Lizzy Fleckenstein fe5a8737b8 Fix light_source warning in mcl_mushroom 2021-04-13 08:49:57 +02:00
Lizzy Fleckenstein e1ccdef42a Merge branch 'master' into mineclone5 2021-04-13 08:22:39 +02:00
Lizzy Fleckenstein 037832a177 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-13 08:06:28 +02:00
epCode 424685d3d3 Add elytra (sprint in air to use) 2021-04-12 14:56:33 -07:00
Lizzy Fleckenstein 5fb7913355 Revert "Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master"" 
This reverts commit 615b15f133.
 2021-04-12 16:36:08 +02:00
Lizzy Fleckenstein d3a3253563 Revert "Revert "Make hoe dig some blocks faster"" 
This reverts commit db5626fcb4.
 2021-04-12 16:34:40 +02:00
Lizzy Fleckenstein c3868084af Revert "Fix crash with removed hoey diggroup" 
This reverts commit ed7099fefc.
 2021-04-12 16:34:25 +02:00
Lizzy Fleckenstein bb16512842 Revert "Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master"" 
This reverts commit 615b15f133.
 2021-04-12 15:28:28 +02:00
Lizzy Fleckenstein 06e8e8f463 Merge branch 'master' into mineclone5 2021-04-12 15:28:00 +02:00
Lizzy Fleckenstein 615b15f133 Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master" 
This reverts commit 7a8079bb64, reversing
changes made to 849823af1f.
 2021-04-12 15:25:31 +02:00
Lizzy Fleckenstein 1ca95f9495 Revert "Fix crash with removed hoey diggroup" 
This reverts commit ed7099fefc.
 2021-04-12 15:19:36 +02:00
Lizzy Fleckenstein 9da82d44c5 Merge branch 'master' into mineclone5 2021-04-12 15:19:04 +02:00
Lizzy Fleckenstein ed7099fefc Fix crash with removed hoey diggroup 2021-04-12 15:18:19 +02:00
Lizzy Fleckenstein 7995ff0527 Revert "Revert "Make hoe dig some blocks faster"" 
This reverts commit db5626fcb4.
 2021-04-12 15:09:48 +02:00
Lizzy Fleckenstein 8b5be69332 Merge branch 'master' into mineclone5 2021-04-12 15:06:49 +02:00
Lizzy Fleckenstein db5626fcb4 Revert "Make hoe dig some blocks faster" 
This reverts commit c1e295de5f.
 2021-04-12 15:05:01 +02:00
kay27 4a3078f04b [mobs] Merge repeat/break/until instead of goto from master 2021-04-11 02:16:09 +04:00
Lizzy Fleckenstein 9ba1917209 Add end crystal beams 2021-04-10 20:58:34 +02:00
kay27 9e15c6f168 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-10 20:01:17 +04:00
NO11 cdd12a0c71 Charcoal made from debarked wood 2021-04-10 11:19:51 +00:00
NO11 652f8d48ed Debark wood with an axe 2021-04-09 22:16:52 +00:00
NO11 988f298375 Add stripped wood crafting 2021-04-09 22:13:50 +00:00
NO11 c73cd8b810 Add stripped spruce textures 2021-04-09 22:11:32 +00:00
NO11 ebd4380c98 Add stripped oak textures 2021-04-09 22:10:47 +00:00
NO11 3d732c2412 Add stripped jungle textures 2021-04-09 22:10:10 +00:00
NO11 03e112ef9b Add stripped dark oak textures 2021-04-09 22:09:16 +00:00
NO11 9b81a4d83e Add stripped birch textures 2021-04-09 22:08:39 +00:00
NO11 cbcaef19c6 Add stripped acacia textures 2021-04-09 22:07:44 +00:00
NO11 9e5fb7f533 Add #490 2021-04-09 22:04:42 +00:00
kay27 3addd4ebb1 Revert "Attemp to fix #1513" in favour of next commit 3375e903ce 
This reverts commit f5f6e232cc.
 2021-04-09 19:06:11 +04:00
kay27 1cb060ea08 [mesecons] Fix attempt to call upvalue in internal.lua 2021-04-09 19:06:11 +04:00
AFCMS d2c65f14a3 Attemp to fix #1513 2021-04-09 19:06:11 +04:00
kay27 d50fd06c82 Revert "Attemp to fix #1513" in favour of next commit 3375e903ce 
This reverts commit f5f6e232cc.
 2021-04-09 19:03:45 +04:00
kay27 3375e903ce [mesecons] Fix attempt to call upvalue in internal.lua 2021-04-09 18:52:33 +04:00
AFCMS f5f6e232cc Attemp to fix #1513 2021-04-09 16:46:41 +02:00
kay27 bc16c33dde Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-09 02:15:15 +04:00
kay27 a733eb8e0c [mesecons] Localise several things in internal.lua 2021-04-09 02:08:03 +04:00
Nils Dagsson Moskopp 7c8cf6f79f Do not crash server if world border is depowered 2021-04-09 01:33:22 +04:00
kay27 f0c2eb86a2 Revert (3/3) "Fix extreme mesecons/redstone crashing at world border" 
This reverts commit 0842a36aa6.
 2021-04-09 01:32:58 +04:00
kay27 26ce10d25c Revert (2/3) "Add erlehmann fix to redstone world border crash" 
This reverts commit b9d175e6a5.
 2021-04-09 01:32:27 +04:00
kay27 6b31e85385 Revert (1/3) "Revert fixes to crash world border" 
This reverts commit 18f73ba31f.
 2021-04-09 01:31:21 +04:00
jordan4ibanez 18f73ba31f Revert fixes to crash world border 2021-04-08 15:48:53 -04:00
jordan4ibanez b9d175e6a5 Add erlehmann fix to redstone world border crash 2021-04-08 15:16:38 -04:00
kay27 871ad8d8d9 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-08 23:07:31 +04:00
jordan4ibanez 0842a36aa6 Fix extreme mesecons/redstone crashing at world border 2021-04-08 14:28:07 -04:00
iliekprogrammar bfc1f253af Allow kelp stems at half height to be treated like full-sized ones. 
Remove debug information
 2021-04-08 20:22:09 +04:00
iliekprogrammar ce66d99504 Fix bug where incorrect number of items are dropped. 2021-04-08 20:22:09 +04:00
iliekprogrammar 70d1aba73e Prevent param2 overflow when adding stems. Fix #1490 2021-04-08 20:22:08 +04:00
iliekprogrammar d50665d2d5 Allow kelp stems at half height to be treated like full-sized ones. 
Remove debug information
 2021-04-08 19:25:19 +08:00
iliekprogrammar 5ccb12586d Fix bug where incorrect number of items are dropped. 2021-04-08 13:35:49 +08:00
iliekprogrammar 2db0e176b3 Prevent param2 overflow when adding stems. Fix #1490 2021-04-08 12:46:04 +08:00
kay27 227180035f Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-08 02:58:17 +04:00
kay27 8e30bc8dbd [mcl_portals] Prevent from spawning Nether portals in Undertale when not enough air space in Nether 2021-04-08 02:54:33 +04:00
kay27 034af87cd7 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-07 20:40:07 +04:00
kay27 99563ab93a Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-07 17:19:41 +04:00
Lizzy Fleckenstein 6e2a7c8a7e Make gateway enderpearl teleports easier 2021-04-07 13:47:48 +02:00
Lizzy Fleckenstein c451866a36 Fix #1426 2021-04-07 09:56:00 +02:00
Lizzy Fleckenstein 3c1a38904a Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-04-07 09:25:44 +02:00
Lizzy Fleckenstein b2c09c8ba0 Add gateway portals 2021-04-07 09:17:13 +02:00
kay27 069e089ae4 [mcl_portals, mcl_structures] Add End gateways W-I-P by Elias Fleckenstein with minor portals improvements and fixes 2021-04-07 03:34:15 +04:00
Lizzy Fleckenstein 430f958fae Move end exit portal to 0, 0; Add end gateway portals (WIP) 2021-04-06 20:08:20 +02:00
Lizzy Fleckenstein f65c40f805 Make dragon egg teleport on punching 2021-04-06 17:20:11 +02:00
Doloment 51f121d516 Merge branch 'master' into ender_chest_fix 2021-04-06 14:57:19 +00:00
Elias Fleckenstein 89a9b16465 Merge pull request 'Add End Credits' (#1469) from credits into master 
Reviewed-on: MineClone2/MineClone2#1469
 2021-04-06 14:39:47 +00:00
Lizzy Fleckenstein ea08fee9ba Make the dragon stay within a 50 blocks range of the portal 2021-04-06 16:38:23 +02:00
Doloment 1e17989ef2 Prevent opening an ender chest while block above it 2021-04-06 21:17:02 +07:00
Lizzy Fleckenstein 91e2372df0 Merge branch 'master' into credits 2021-04-06 16:06:12 +02:00
Elias Fleckenstein 058c6ef9f4 Merge pull request 'Fix chest entity textures' (#1472) from Doloment/MineClone2:master into master 
Reviewed-on: MineClone2/MineClone2#1472
 2021-04-06 14:03:30 +00:00
Lizzy Fleckenstein 83b9cf3ad2 End exit portal openng / closing on dragon death / spawn 2021-04-06 15:48:17 +02:00
Doloment 31a7a4fbb6 Merge branch 'master' into master 2021-04-06 13:42:07 +00:00
Lizzy Fleckenstein 962a13847e Fix dragons summoned using commands spawning an egg on the exit portal 2021-04-06 14:57:29 +02:00
Doloment 055c406d7a Fix chest entity textures (trapped chests were lighter) 2021-04-06 18:57:06 +07:00
Lizzy Fleckenstein a348909ba3 Enderdragon: Proper Egg and XP spawning 2021-04-06 12:50:36 +02:00
Lizzy Fleckenstein c93a865098 Remove empty line from mcl_portals 2021-04-06 11:59:22 +02:00
Lizzy Fleckenstein 175cb44fb1 Merge branch 'master' into credits 2021-04-06 10:53:15 +02:00
kay27 a324ac0308 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-06 01:16:02 +04:00
AFCMS 91da727184 Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2 2021-04-05 15:22:57 +02:00
AFCMS 339e3e2792 fix some tools not using right var 2021-04-05 14:32:48 +02:00
AFCMS 28402ca663 store tool wield scale in a global var 2021-04-05 10:16:56 +02:00
Lizzy Fleckenstein 90f312f772 Add credits overlay prototype 2021-04-04 19:13:46 +02:00
kay27 3e0bbda3f7 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-04 14:20:01 +04:00
Lizzy Fleckenstein 598692cf8c Add nil check to prevent crashes with mcl_throwing 2021-04-04 12:10:21 +02:00
kay27 4027c9fa29 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-03 01:25:40 +04:00
AFCMS 0db47dbf02 Merge branch 'remove-alpha-field' 2021-04-02 14:43:08 +02:00
AFCMS 59d687c579 fix API.md 2021-04-02 14:30:46 +02:00
AFCMS c457c4ce3c fix undeacleared vars in mcl_fishing 2021-04-02 14:28:43 +02:00
AFCMS ead33e3520 fix undeacleared vars in mcl_throwing 2021-04-02 14:27:35 +02:00
AFCMS e20e0fab71 remobe backward compatibility for portals 2021-04-02 14:16:14 +02:00
AFCMS 695ad9120b remove backward compatibility for water 2021-04-02 14:12:44 +02:00
NO11 39aaf0f21f Fix #1391 2021-04-02 11:09:45 +00:00
kay27 30973086e0 Merge remote-tracking branch 'origin/master' into mineclone5 2021-04-01 01:42:58 +04:00
epCode 5356e97b77 fix copy/pasted arrow texture to pixel-perfection 2021-03-31 11:23:59 -07:00
kay27 618a8dfa2b Merge remote-tracking branch 'origin/master' into mineclone5 2021-03-31 16:31:53 +04:00
iliekprogrammar 9885f36c62 Fix missing age metadata and timer initialization in on_place. 2021-03-31 19:27:57 +08:00
kay27 c6e0b229be Merge remote-tracking branch 'ilp/kelp' into mineclone5 2021-03-31 14:28:51 +04:00
iliekprogrammar bfff643ff4 Allow age to override during initialization. 2021-03-31 17:38:38 +08:00
iliekprogrammar ccea673dcc Fix updating age metadata. Remove kelp.lock_drop. 2021-03-31 17:31:28 +08:00
iliekprogrammar 08e280d9b4 Comment out debug stuff 2021-03-31 14:17:50 +08:00
iliekprogrammar 52c788f197 Merge branch 'master' into kelp 2021-03-31 13:59:27 +08:00
iliekprogrammar 089d6aa5c8 Add dug sounds to kelp when unsubmerged 2021-03-31 13:55:07 +08:00
iliekprogrammar 9518086b6b Kelp store age metadata by bulk on a queue, improve API, etc. 
Highlights:
- Implement storing age metadata by bulk on a queue, with maximum interval and queue length.
- "Flexible" initial growth probability. Will provide helper APIs.
- Fix various bugs with unsubmerged kelp detection, submerged tip detection, age metadata.
- Various optimizations.
 2021-03-31 13:41:52 +08:00
kay27 9c5af40589 Add mcl_bubble_column by j45, extra_mobs by epCode, mcl_mushroom & mcl_blackstone by Debiankaios, mcl_nether_gold by NO11 2021-03-30 23:23:31 +00:00
epCode 86b63c8bc4 Make player model easier to use 2021-03-30 13:26:46 -07:00
epCode 38e4e7293a fix female player anim XD 2021-03-30 10:29:46 -07:00
epCode a14959ac70 add player death animation and particles 2021-03-30 09:53:55 -07:00
AFCMS a040355dce Revert "Revert "Revert "improve wieldview API (!)""" 
This reverts commit d4e0d4d1c1.
 2021-03-30 01:00:51 +02:00
AFCMS d4e0d4d1c1 Revert "Revert "improve wieldview API (!)"" 
This reverts commit 613779a851.
 2021-03-30 01:00:17 +02:00
AFCMS 613779a851 Revert "improve wieldview API (!)" 
This reverts commit 600e8bede2.
 2021-03-30 00:59:00 +02:00
AFCMS 600e8bede2 improve wieldview API (!) 
to support transform registration without groups
this will make detaching screwdriver from mcl more easy
 2021-03-30 00:35:29 +02:00
AFCMS 84819bf9f5 MAKE EVERY SINGLE MOD USE PROPER COLORS!!! 2021-03-30 00:01:29 +02:00
AFCMS f8a627915e use proper colors in mcl_books 2021-03-29 22:57:05 +02:00
AFCMS f51deb0737 use propers colors in mcl_jukebox 2021-03-29 22:21:14 +02:00
ArTee3 1b9737b431 Prevent beds from appearing and disappearing if they cannot be placed, fix #1419 2021-03-29 18:19:46 +02:00
iliekprogrammar ecdbc30b63 Overhaul kelp interactions. 
Highlights:
- Added locking system to drops. Will be removed after testing.
- Expose more variables and functions. Will be finalized soon.
- Implement MC-like age and natural growth mechanics.
- Implement correct piston interactions with kelp and its surface.
- Implement correct falling node interactions for its surface.
- ABMs are now nonfunction. Will be fixed.
- Various optimizations and fixes.
 2021-03-29 14:09:09 +08:00
kay27 80d845adb6 [mcl_mapgen_core] Fix Nether generation chain reaction 2021-03-29 03:18:17 +04:00
kay27 bbd52043f1 [mcl_portals] Make '/spawnstruct nether_portal' chat command work in obsidian nodes (immediate destruction triggered) 2021-03-29 02:17:32 +04:00
kay27 05260d03d5 [mcl_portals] Fix crash on access empty index trying to find portal after its destruction 2021-03-29 01:33:01 +04:00
kay27 cb2aae5a55 [mcl_mapgen_core] Redesign, mostly to remove water from End and restore static lvm_buffer to speed it up 2021-03-28 22:57:11 +04:00
AFCMS d07cf64d11 Merge pull request 'mcl_death_drop refactoring' (#1415) from mcl-death-drop-refactoring into master 
Reviewed-on: MineClone2/MineClone2#1415
 2021-03-28 18:13:57 +00:00
AFCMS 5a4355b859 Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-03-28 19:44:43 +02:00
kay27 628ca226a6 [mcl_portals] Additionally index source Nether portals from 0.71 and earlier before teleporting, to make possible returning through them 2021-03-28 20:36:35 +04:00
iliekprogrammar 24da94ec3b Disable ABMs in favor of nodetimers to check if kelp is unsubmerged. 2021-03-28 20:29:29 +08:00