Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity
7,014 Commits
85 Branches
80 Tags
173 MiB
Commit Graph

3225 Commits (d662fa8bd064282d9f7248d33c76274e71f8f7e1)

Author SHA1 Message Date
Code-Sploit ba333d016a Merge pull request 'master' (#1736) from master into mineclone5 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1736
 2021-05-13 11:57:33 +00:00
jordan4ibanez 052bb540ba Remove unused parent data for arrows 2021-05-10 20:06:38 -04:00
NO11 9fa51dc6b9 Simplify wooden planks crafting 2021-05-10 10:06:34 +00:00
NO11 6ffb7f525a Add more crafting recipes for wooden planks (including stripped wood) 2021-05-10 09:40:16 +00:00
Elias Fleckenstein f79ace6306 Fix upgrading of enchanted items 2021-05-10 10:00:13 +02:00
kay27 24dfda8d7e Merge branch 'master' into mineclone5 2021-05-10 06:19:56 +04:00
kay27 f3c540af5d [mcl_mapgen_core, mcl_biomes] Make chorus growth deterministic 2021-05-10 02:24:52 +04:00
NO11 a3d3055e8a Remove cactus destroys minecart from master 2021-05-09 22:10:08 +00:00
NO11 7b78d500fd Better textures for stripped wood part3 2021-05-09 21:57:06 +00:00
NO11 358ea695e1 Better textures for stripped wood part2 2021-05-09 21:55:51 +00:00
NO11 f6b8133381 Better textures for stripped wood part1 2021-05-09 21:54:56 +00:00
NO11 96aec38947 Merge pull request 'master' (#3) from MineClone2/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/NO11/MineClone2/pulls/3
 2021-05-09 21:52:37 +00:00
Elias Fleckenstein 052bfa0cab Revert "Clean the mess (thank you soo much the person who did it) (no offense)" 
This reverts commit 2064c34858.
 2021-05-09 16:14:17 +02:00
Code-Sploit 2064c34858 Clean the mess (thank you soo much the person who did it) (no offense) 2021-05-09 14:12:12 +00:00
Elias Fleckenstein 0133f94a36 Fix upgrading of diamond armor 2021-05-09 12:48:53 +02:00
Code-Sploit 05a9b614b0 Merge branch 'mineclone5' of https://git.minetest.land/MineClone2/MineClone2 into mineclone5 
Merge upstream changes to local branch
 2021-05-08 17:04:25 +00:00
Code-Sploit 71d98892d4 Prevent crash in fix 2021-05-08 17:03:59 +00:00
Code-Sploit 72d4cf5906 Second part of fix try stupid bug 2021-05-08 16:58:10 +00:00
Code-Sploit 1dcd555149 Try 1 to fix the stupid changes to mcl_armor that caused non-upgradable diamond armor 2021-05-08 16:53:46 +00:00
kay27 43e44ff4c9 Merge remote-tracking branch 'origin/master' into mineclone5 2021-05-08 14:12:25 +04:00
kay27 31b56e77ee [mcl_mobspawners] Remove a typo (tab character) 2021-05-08 14:12:13 +04:00
kay27 f53f961122 Merge remote-tracking branch 'origin/master' into mineclone5 2021-05-08 14:09:32 +04:00
kay27 4bb27a0d79 [mcl_mobspawners] Fix random crash, https://git.minetest.land/MineClone2/MineClone2/issues/1707 2021-05-08 14:09:16 +04:00
NO11 b37cbbebb8 Fix ancient debris duplication glitch (remove fortune drop) 2021-05-07 22:50:35 +00:00
Elias Fleckenstein 1bd647507b Add proper end crystal death message 2021-05-05 13:20:06 +02:00
Elias Fleckenstein a9817fea4b Merge branch 'master' into real_maps 2021-05-05 08:21:01 +02:00
Elias Fleckenstein 70db02306f Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2 2021-05-05 08:19:59 +02:00
Elias Fleckenstein f7280dc4f0 Remove mod screenshots since they only take up space and are partly outdated 2021-05-04 20:16:30 +02:00
Elias Fleckenstein 7513bc600a Merge branch 'master' into compass_and_clock 2021-05-04 09:04:50 +02:00
Elias Fleckenstein f96258ca5c Fix mob heads not showing their texture when worn as head armor 2021-05-04 09:01:53 +02:00
Elias Fleckenstein 33c6e5cdad Fix wearing pumpkin heads as armor 2021-05-04 08:59:01 +02:00
Elias Fleckenstein 2c5eca3999 Make clocks work in itemframes 2021-05-04 08:49:21 +02:00
Elias Fleckenstein 74e3c6555d Globalize mcl_clock API 2021-05-03 13:43:46 +02:00
Elias Fleckenstein ecc2010fe5 Make compasses work in itemframes 2021-05-03 11:22:47 +02:00
Elias Fleckenstein 5bb1657bd8 Add moving marker for the player 2021-05-03 10:46:59 +02:00
Elias Fleckenstein f063d14caf Add craft predict for map copying 2021-05-02 19:30:27 +02:00
Elias Fleckenstein 0d287001f7 Fix tt snippet to update wield filled maps as well 2021-05-02 19:18:30 +02:00
Elias Fleckenstein 63d4e57a8d Correct typo (ninetest -> minetest) 2021-05-02 17:19:11 +02:00
Elias Fleckenstein ecea8f1662 Prevent placing of wielded maps 2021-05-02 17:14:57 +02:00
Elias Fleckenstein ef08977112 Copy stack before accessing it in add_item 2021-05-02 17:11:33 +02:00
Elias Fleckenstein 1f87874870 Make it look like the player is holding the map in their hand 2021-05-02 17:03:39 +02:00
Elias Fleckenstein 9a3ae17564 Make maps show their image when in itemframes 2021-05-02 16:04:48 +02:00
Elias Fleckenstein bd74dbe321 Revert "Use PNG instead of TGA" 
This reverts commit ca9cd8cbe0.
The TGA was faster and produced smaller files.
 2021-05-02 13:03:18 +02:00
Elias Fleckenstein ca9cd8cbe0 Use PNG instead of TGA 2021-05-02 12:55:04 +02:00
Elias Fleckenstein d9a670dcb8 Show empty map in creative inv, but don't show filled map there 2021-05-02 12:24:22 +02:00
Elias Fleckenstein f22b3fd457 Implement copying maps 2021-05-02 12:23:29 +02:00
Elias Fleckenstein 1079ab74d4 Stack filled maps that have the same metadata 2021-05-02 11:42:16 +02:00
Code-Sploit 8c2f5bc3d2 Fix #1706 2021-05-02 08:31:26 +00:00
Code-Sploit 445af4e4c9 Remove unnessacary comments in mcl_smithing_table/init.lua 2021-05-02 08:11:11 +00:00
NO11 f430ebcc8d Add #924, cactus breaks minecart 2021-05-01 17:29:08 +00:00