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

11001 Commits (7726e576f0ae9e426d4dba3dee875f300974e169)

Author SHA1 Message Date
ancientmarinerdev 924d999ec2 Merge pull request 'Fix mcl_skins crash' (#3584) from skins into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3584
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-25 01:47:50 +00:00
Johannes Fritz a52931f986 Fix mcl_skins crash 2023-03-24 15:53:07 -05:00
ancientmarinerdev c499d20d25 Merge pull request 'Add lantern functions for adding nodes to allowed placement list' (#3567) from lanterns-add-allowed-functions into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3567
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-23 22:23:16 +00:00
SmokeyDope 47b6e54dad Add comments explaining new lantern functions 2023-03-23 22:18:04 +00:00
SmokeyDope 257e5f993b Add lantern functions for adding nodes to allowed placement list 2023-03-23 22:18:04 +00:00
ancientmarinerdev f02afca62c Merge pull request 'Remove evoker spawning in Pillager Outposts' (#3557) from remove_evokers_outpost into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3557
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-23 01:58:38 +00:00
PrairieWind 802ff3d984 Remove evoker spawning in Pillager Outposts 2023-03-23 01:53:44 +00:00
ancientmarinerdev 9367c96525 Merge pull request 'Fixing that annoying chest open and close sounds' (#3566) from sound_tweaks into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3566
 2023-03-23 01:34:29 +00:00
ancientmarinerdev f319a8d903 Fixing that annoying chest open 2023-03-23 01:29:05 +00:00
ancientmarinerdev 5e8bc16a0c Merge pull request 'Diminixed normalized volume levels of songs + 2 new tracks, 2 updated versions!' (#3564) from music_normalise_volumes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3564
 2023-03-23 01:28:33 +00:00
ancientmarinerdev c5a15192b3 Updated with new song names in credits 2023-03-23 01:18:14 +00:00
ancientmarinerdev e41b166c1b Updated credits 2023-03-23 01:18:14 +00:00
ancientmarinerdev c393b15965 Updated music to 64kbs 2023-03-23 01:18:14 +00:00
ancientmarinerdev f5ea3894cf 2 new songs. 2 updated songs. All volums remastered to same perceived volumes. 2023-03-23 01:18:14 +00:00
ancientmarinerdev 0fbdc07402 Merge pull request 'Adjust speeds to make it less ridiculous' (#3556) from mob_speeds_overworld_tweak into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3556
 2023-03-23 01:11:54 +00:00
ancientmarinerdev 41882e9e1f Adjust speeds to make it less ridiculous 2023-03-23 00:38:18 +00:00
ancientmarinerdev 15fce1130e Merge pull request 'Bundled lua with 5.7 crashes when you right click a farmer villager. math.random needs correct order' (#3576) from fix_villager_crash_with_bundle_lua into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3576
 2023-03-22 04:45:20 +00:00
ancientmarinerdev 2440b73e67 Bundled lua with 5.7 crashes when you right click a farmer villager. math.random needs correct order 2023-03-22 03:55:27 +00:00
ancientmarinerdev 109bf17723 Merge pull request 'Fix warnings and global vars' (#3568) from fix_global_warnings into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3568
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
 2023-03-22 01:17:41 +00:00
ancientmarinerdev a513547958 Remove title 2023-03-21 22:20:26 +00:00
ancientmarinerdev 1c0387b898 Fix warnings and global vars 2023-03-21 22:20:26 +00:00
ancientmarinerdev 5409a382f9 Merge pull request 'Make mobs ride minecarts' (#3507) from mobs_in_minecarts into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3507
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-20 13:42:38 +00:00
ancientmarinerdev ecf72db684 Fix ooops 2023-03-20 13:37:26 +00:00
ancientmarinerdev bcd7f38fa7 Use new style vectors 2023-03-20 13:37:25 +00:00
ancientmarinerdev 3eab946889 Make death check less frequent. Load passenger in minecart at shutdown. 2023-03-20 13:37:25 +00:00
anarquimico f817fe7f72 Fix performance issues and better check for mobs death 2023-03-20 13:37:25 +00:00
anarquimico d5f01e88c4 Make mobs ride minecarts 2023-03-20 13:37:25 +00:00
ancientmarinerdev b4ea9f048b Merge pull request 'Tweak lapis distribution.' (#3562) from lapis_distribution into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3562
Reviewed-by: SmokeyDope <smokey@tilde.team>
 2023-03-19 21:24:46 +00:00
ancientmarinerdev 6989e00af7 Tweak lapis distribution. 2023-03-19 18:01:39 +00:00
ancientmarinerdev 23f0c9a83e Merge pull request 'Implementing slime mapblocks!' (#3551) from slime_chunk into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3551
Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
 2023-03-19 02:57:41 +00:00
ancientmarinerdev 81a258d33b Clean up and reorder code 2023-03-19 02:44:35 +00:00
ancientmarinerdev bd579314ba Remove logging and clean up 2023-03-19 02:44:35 +00:00
ancientmarinerdev e7449a65d8 Fix check_position and change spawn check to stages 2023-03-19 02:44:35 +00:00
ancientmarinerdev b8b47e55e1 Add in slime chunks 2023-03-19 02:44:35 +00:00
ancientmarinerdev 1182ce349a Merge pull request 'adjust crop hitboxes' (#3555) from Fix-potato-hitbox into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3555
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-18 22:04:07 +00:00
SmokeyDope 3f80cc8f26 Adjust beetroot hitbox heights 2023-03-18 21:59:46 +00:00
SmokeyDope 68a44d7824 one more carrot adjust 2023-03-18 21:59:46 +00:00
SmokeyDope ced3b4dff1 Adjust carrot hitbox heights 2023-03-18 21:59:46 +00:00
SmokeyDope 44711369d9 Further adjust potato hitbox heights 2023-03-18 21:59:46 +00:00
SmokeyDope 3839250b38 Fix potatoes stage 2 hitbox 2023-03-18 21:59:46 +00:00
ancientmarinerdev a4b4e4de69 Merge pull request 'Add sounds when using composter' (#3549) from composter-add-sounds into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3549
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-18 18:35:11 +00:00
ancientmarinerdev 002a63585f Tweak volume and change reference to missing global variable 2023-03-18 18:30:03 +00:00
SmokeyDope 811f8ac516 One more indentation fix, sorry for the extra commit 2023-03-18 18:30:03 +00:00
SmokeyDope 89f2c06af2 Fix accidental extra spaces 2023-03-18 18:30:03 +00:00
SmokeyDope 20f8e18098 Add sounds when using composter 2023-03-18 18:30:03 +00:00
ancientmarinerdev 3b4fc04330 Merge pull request 'Remove unused translations' (#3539) from syl/MineClone2:unusedtranslations into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3539
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-03-18 18:09:37 +00:00
ancientmarinerdev d437f45f4a Merge pull request 'Sculk removed off xp_step and triggered by player and mob death [Performance]' (#3545) from sculk_performance_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3545
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2023-03-17 20:42:23 +00:00
ancientmarinerdev ef633ce617 Do not throw XP if in creative 2023-03-17 20:36:53 +00:00
ancientmarinerdev a3f23d0b35 Remove unneeded logging 2023-03-17 20:36:53 +00:00
ancientmarinerdev 2c7039fdda Clean up code 2023-03-17 20:36:53 +00:00