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

9657 Commits (revert_chest_models)

Author SHA1 Message Date
cora 2e8f4fdb14 Revert "Remove unnecessary media files from mcl_chests" 
This reverts commit 7579e430c8.
 2022-11-25 22:52:49 +01:00
cora 5b5d9bdf4a Revert "fix chests" 
This reverts commit 6c6e21b63e.
 2022-11-25 22:52:25 +01:00
cora 901f793489 Revert "Fix ender and shulker nodeboxes" 
This reverts commit 080182ab15.
 2022-11-25 22:52:19 +01:00
cora 0942949c5d Merge pull request 'Fix axolotl breeding' (#3007) from Axolotl into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3007
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-25 02:48:55 +00:00
cora b255c8c23e Merge pull request 'Fix Baby Striders being extra small' (#3010) from baby_strider_size_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3010
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-24 22:31:14 +00:00
PrairieWind e1ba319616 Fix Baby Striders being extra small 2022-11-24 14:46:54 -07:00
Johannes Fritz 88897566d9 Fix axolotl breeding 2022-11-24 09:10:17 -06:00
PrairieWind 4cc0a5b0f1 Merge pull request 'Remove tools/remove_end.py' (#3000) from remove_remove_end into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3000
Reviewed-by: AFCMS <afcm.contact@gmail.com>
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-11-23 17:08:18 +00:00
cora ab0f88ad37 Remove remove_end.py 2022-11-23 09:49:32 +01:00
cora 53c1ed9fbf Merge pull request 'Axolotl' (#2870) from TheOnlyJoeEnderman/MineClone2:Axolotl into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2870
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-23 03:18:36 +00:00
cora a3fbb2e0c9 Merge pull request 'Grass Block Underside Fix' (#2987) from FossFanatic/MineClone2:grass_block_underside_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2987
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-21 10:34:12 +00:00
cora 22063a64db Merge pull request 'update .gitignore' (#2994) from gitignore_update into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2994
 2022-11-21 02:29:56 +00:00
Michieal 9fc27da873 update .gitignore 
Preventing .idea directories from being uploaded to the branches. 
Makes it easier for devs that use IntelliJ's IDEA. (at least 2 developers here currently use it)
 2022-11-21 02:05:27 +00:00
PrairieWind 556316ae34 Merge pull request 'Make waterlogged roots more water looking' (#2992) from waterlogged_roots_visual_update into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2992
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-11-20 19:28:28 +00:00
Michieal 9ffdd13fa5 Make waterlogged roots more water looking 
A quick change to the setting within the wlroots definition that makes the water translucent.
It's not perfect, but I think it looks better blended than opaque.
 2022-11-20 19:16:39 +00:00
PrairieWind 9cfbbef41d Merge pull request 'Fix lightning boat crash' (#2990) from fix_lightning_boat_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2990
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-11-20 19:12:38 +00:00
cora adfbf4bc64 Fix lightning boat crash 2022-11-20 02:54:42 +01:00
FossFanatic 1a5aed704c Fix underside of grass block 2022-11-19 11:28:31 +00:00
cora d738eb0554 Merge pull request 'Updated colors.txt' (#2986) from Ranko_Saotome/MineClone2:master into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2986
 2022-11-19 01:24:55 +00:00
Ranko_Saotome 0fb6d20bc7 Updated colors.txt 2022-11-19 01:11:40 +00:00
cora 94e7520b08 Merge pull request '`mcl_tnt` fixes' (#2937) from mcl-tnt-fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2937
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-19 00:28:04 +00:00
AFCMS 029769f48f Fixes to `mcl_tnt` 
- reorder code
- fix potential crashes with not handeled nil values
- use new vectors
 2022-11-19 01:27:32 +01:00
cora 0fb040476b Merge pull request 'mcl_enchanting: Add missing dependency on mcl_experience.' (#2984) from missing-dep-ench-xp into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2984
 2022-11-18 20:35:51 +00:00
Daniel Cassidy 79192d51ed mcl_enchanting: Add missing dependency on mcl_experience. 2022-11-18 21:30:50 +01:00
cora 6051731645 Merge pull request 'Respawn Anchor Top Animation' (#2981) from FossFanatic/MineClone2:respawn_anchor_animation into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2981
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-18 13:47:53 +00:00
FossFanatic e25415e047 Merge branch 'master' into respawn_anchor_animation 2022-11-18 08:24:57 +00:00
FossFanatic f93af56bf6 Remove MineCraft derivative texture 2022-11-18 08:16:53 +00:00
FossFanatic f8b98d784b Add animated top texture 2022-11-18 08:12:16 +00:00
FossFanatic e898b72f3d Add animated top texture 2022-11-18 08:11:39 +00:00
cora 90bd0ee315 Merge pull request 'signs_crafting_fix' (#2980) from signs_crafting_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2980
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-17 23:52:44 +00:00
cora 7d63b07e09 Fix mangrove sign registrations 2022-11-18 00:51:45 +01:00
Michieal 197e807684 Fix the crafting recipes for the signs. 
Placed in the proper place. Ugh.
 2022-11-18 00:51:45 +01:00
Michieal 467700591b revert 62fb34a029a78e74a4b768a30827961329719551 
revert Fix the crafting recipes for the signs.
 2022-11-18 00:51:45 +01:00
Michieal a7e643818f Fix the crafting recipes for the signs. 2022-11-18 00:51:45 +01:00
cora cf282a5154 Merge pull request 'Make Raw Copper (Block) smeltable in the blast furnace' (#2978) from blast_f_smelt_copper into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2978
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-17 23:39:35 +00:00
PrairieWind 1877f7261e Make Raw Copper (Block) smeltable in the blast furnace 2022-11-18 00:33:17 +01:00
cora adeb6c42e5 Merge pull request 'Make kelp cookable in the smoker' (#2979) from anarquimico/MineClone2:kelp_smoker into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2979
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-17 23:30:21 +00:00
anarquimico e658e29179 Make kelp cookable by smoker. 2022-11-17 20:16:58 -03:00
PrairieWind 7e3cb59863 Merge pull request 'Base mcl_skins templates off old PP skins' (#2977) from old_pp_skins into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2977
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-11-17 21:53:45 +00:00
Johannes Fritz a6db44b71f Base mcl_skins templates off old PP skins 2022-11-17 21:52:35 +00:00
PrairieWind eaccd71558 Merge pull request 'Sweet berries: Add rightclick harvesting' (#2971) from sweet_berries into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2971
Reviewed-by: PrairieWind <prairie.astronomer1@gmail.com>
 2022-11-17 19:48:30 +00:00
cora 142f3d6d5a Handle bonemealing in the sweetberry on_rightclick 2022-11-17 19:42:02 +00:00
cora 328a377940 export apply_bone_meal function in mcl_dye 
this is essentially just a hack to not put any more sweetberry code
in mcl_dye because the architecture makes it necessary for mcl_dye
to depend on mcl_farming, not the other way around - hence all the
plant bonemealing is done in mcl_dye...
 2022-11-17 19:42:02 +00:00
cora c5ec3c770c Sweet berries: Add rightclick harvesting 2022-11-17 19:42:02 +00:00
cora 5a9d428151 Merge pull request 'Hoppers pulling from chest minecart' (#2954) from anarquimico/MineClone2:hoppers_mc_chest into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2954
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-17 05:38:39 +00:00
cora 883ca05c3a Merge pull request 'Add missing EndBarrens biome definition' (#2970) from endbarrens into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2970
 2022-11-17 05:33:44 +00:00
cora dea647129e Add missing EndBarrens biome definition 2022-11-17 06:32:38 +01:00
cora 35e30df552 Merge pull request 'Make Steve hair unlike MC' (#2963) from steve_hair into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2963
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-17 05:31:40 +00:00
Johannes Fritz d764c3eac3 Make Steve hair unlike MC 2022-11-17 05:30:55 +00:00
cora f397ff83ff Merge pull request 'Honey and Beehives' (#2911) from honey into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2911
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-17 02:28:11 +00:00