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

11278 Commits (5f0944062cbfe1fab59e4f93e934c45435c3bf72)

Author SHA1 Message Date
ancientmarinerdev f09b723885 Merge pull request 'Release 0.82' (#3337) from release_0_82_0 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3337
 2023-01-20 14:43:45 +00:00
ancientmarinerdev efd3420d52 Post-release set version 0.82.0-SNAPSHOT 2023-01-19 23:34:04 +00:00
ancientmarinerdev 62be5a06f6 Update release notes 2023-01-19 22:22:48 +00:00
ancientmarinerdev 683799aea5 Update release steps 2023-01-19 21:54:01 +00:00
ancientmarinerdev 383cbf96a6 Pre-release set version 0.82.0 2023-01-19 21:51:16 +00:00
ancientmarinerdev a7632e767d Run credits update script for release 0.82 2023-01-19 21:09:42 +00:00
ancientmarinerdev 99d09c76ae Merge pull request 'mcl_bamboo2_cleanup' (#3327) from mcl_bamboo2_cleanup into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3327
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-19 21:01:08 +00:00
ancientmarinerdev c7ebe1b8cd Updated Bamboo textures by Nicu. Updated credits as per request from Michieal 2023-01-19 20:51:49 +00:00
ancientmarinerdev 5c464f1c1d Merge pull request 'Grass Footstep Sound Fix' (#3312) from grass_sound_revert into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3312
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-19 13:02:38 +00:00
ancientmarinerdev 87e6842c00 Merge pull request 'Update credits' (#3334) from release_0_82_credits into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3334
 2023-01-19 01:36:13 +00:00
Michieal b258ccffdc Merge Master into mcl_bamboo_cleanup 2023-01-18 20:29:40 -05:00
ancientmarinerdev 83b0807218 Update credits 2023-01-19 00:04:16 +00:00
Michieal a00ef4500d Merge branch 'master' into mcl_bamboo2_cleanup 2023-01-18 18:40:23 -05:00
PrairieWind c49aef3251 Merge pull request 'Disable zombie siege raid until we stop zombies pathing through door' (#3329) from disable_zombie_siege into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3329
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2023-01-18 20:51:04 +00:00
ancientmarinerdev f3ba32d739 Disable zombie siege raid until we stop zombies pathing through door 2023-01-18 19:47:45 +00:00
Michieal ed03cb470d Change Bamboo Trapdoor to be Boring. 2023-01-17 22:12:57 -05:00
FossFanatic 9746dbc376 Make the LBM run at every load again 
After testing this out, it seems that the LBM only works consistenly when it runs at every load.
 2023-01-17 16:04:12 +00:00
FossFanatic d89a7e0326 Rename _mcl_palette_index back to _mcl_grass_palette_index 2023-01-17 12:55:40 +00:00
FossFanatic 5fd5cc9f1c Merge branch 'master' into simplified_palette_index 2023-01-17 12:53:09 +00:00
FossFanatic c75ec6916c Conflict fix attempt 2 2023-01-17 12:52:50 +00:00
FossFanatic 4b6b4d8398 revert 26e032687a 
revert Fix conflict with most recent master
 2023-01-17 12:49:43 +00:00
FossFanatic 513d148eaf Merge branch 'master' into grass_sound_revert 2023-01-17 12:44:16 +00:00
FossFanatic 26e032687a Fix conflict with most recent master 2023-01-17 12:39:15 +00:00
Michieal b99487b6ab Merge branch 'master' into mcl_bamboo2_cleanup 2023-01-16 20:19:03 -05:00
ancientmarinerdev 8adc1d48b2 Merge pull request 'Remove "mcl_farming:beetroot_item" from fortune drop, so Fortune only gives seeds.' (#3328) from beetroot_fortune_hotfix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3328
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-17 00:59:25 +00:00
Michieal ac30e25065 Remove "mcl_farming:beetroot_item" from fortune drop, so Fortune only gives seeds. 2023-01-16 19:40:07 -05:00
Michieal 0931af21c8 Remove most oak trees from Bamboo biomes. 2023-01-16 18:34:48 -05:00
Michieal 77a8ca689f Give textures more definition. 2023-01-16 18:16:26 -05:00
ancientmarinerdev 30d3b7ee23 Merge pull request 'mcl_bamboo Part 2.' (#3208) from mcl_bamboo_too into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3208
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
 2023-01-16 20:22:09 +00:00
Michieal 55bb9800f4 removed errant logging line. 2023-01-16 15:07:57 -05:00
Michieal b805ae9926 Adjust bamboo growth rates to be close to the MC wiki. 2023-01-16 15:01:38 -05:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 90c74f4a6a Merge pull request 'Fix undeclared global variable in mcl_buckets' (#3314) from buckets_warning into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3314
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-16 19:02:34 +00:00
Johannes Fritz 6e6c11cde2 Fix undeclared global variable in mcl_buckets 2023-01-16 12:56:59 -06:00
Michieal d48b3dcaee Starting Inventory fix #4 Optimized and remove chatcommand. 2023-01-16 02:12:39 -05:00
Michieal 88493091b6 Starting Inventory fix #3. turn off debugging in code. 
Ready for testing.
 2023-01-16 01:58:27 -05:00
Michieal d68667beb9 Starting Inventory fix #2. add in chat command, /give_starting_inventory. add in debug code. 2023-01-16 01:53:35 -05:00
Michieal 181628e539 Starting Inventory fix #2 2023-01-16 00:51:23 -05:00
Michieal c57a757510 Starting Inventory fix #1/ 2023-01-16 00:21:15 -05:00
Michieal 26f3275b7c renamed to mcl_starting_inventory... continued. Fixed the setting in settingtypes.txt 2023-01-15 21:23:49 -05:00
Michieal 45b4b4a458 renamed to mcl_starting_inventory as that is what it is. 2023-01-15 21:21:26 -05:00
Michieal 5424ca8c2b Created Starting Chest that is given to players. 
Based on the "give_initial_stuff" mod.
 2023-01-15 20:39:51 -05:00
ancientmarinerdev 8feefcdd7b Merge pull request 'Give longer to breed mobs. 1.5s is not enough' (#3298) from extend_breeding_time into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3298
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-16 00:01:40 +00:00
ancientmarinerdev 9b28baaad6 Give longer to breed mobs. 1.5s is not enough 2023-01-16 00:00:28 +00:00
PrairieWind 60a1a364dc Merge pull request 'Fix animals jumping way too high upon growing up' (#3316) from growth_jump_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3316
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-15 23:43:07 +00:00
b3nderman f9b021e4c6 Fix animals jumping way too high upon growing up 2023-01-15 22:47:05 +00:00
ancientmarinerdev 65fb911e5f Merge pull request 'Fix geode crash' (#3304) from fix_geode_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3304
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-15 22:28:38 +00:00
ancientmarinerdev 38732e801d Fix geode crash 2023-01-15 22:27:02 +00:00
ancientmarinerdev 5ad2a990d4 Merge pull request 'Allow blaze spawners to be deactivated' (#3315) from fix_blaze_spawner_disable into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3315
Reviewed-by: Michieal <michieal@noreply.git.minetest.land>
 2023-01-15 22:24:59 +00:00
ancientmarinerdev 8f6c932e88 Allow blaze spawners to be deactivated 2023-01-15 22:22:14 +00:00
Michieal e9c202ae45 Added Bamboo Biomes to spawning.lua. 2023-01-15 15:30:34 -05:00