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

9954 Commits (42f8fbf9b86dfe8b7e908b9b86e9f6af0aef3991)

Author SHA1 Message Date
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 dec2c2bade Merge branch 'master' into cocoa_pod_fixes 2022-11-18 08:27:19 +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
PrairieWind 89a342a34f Add Bee Nest Tree Schematics and generation 2022-11-17 03:16:45 +01:00
PrairieWind b17dcf26da Make beehives transparent and not launch entities, thanks MysticTempest! 2022-11-17 03:16:45 +01:00
PrairieWind c767c617f8 Add waxing copper blocks 2022-11-17 03:16:45 +01:00
PrairieWind fb651a4922 Wax On and Wax Off Advancements 2022-11-17 03:16:45 +01:00
PrairieWind 16f878d3dc Make Honey Blocks Sticky 
Uses slime block stickiness code.
 2022-11-17 03:16:45 +01:00
PrairieWind bbb908239b Total Beelocation Advancement 2022-11-17 03:16:45 +01:00
PrairieWind 0aaaa05164 Bee Our Guest Advancement 2022-11-17 03:16:45 +01:00
PrairieWind 8a3c1eaa6e Add harvest and digging damage, and campfire usage 
Damage is temporary until bees are implemented
 2022-11-17 03:16:45 +01:00
PrairieWind a79692a68b Add harvesting functionality to bee nests 
Still has temporary abm updating
 2022-11-17 03:16:45 +01:00
PrairieWind cb60338f10 Add basic functionality to beehives 
Uses a temporary ABM to progress through honey levels
 2022-11-17 03:16:45 +01:00
PrairieWind 89b02c126a Add basic beehives and bee nests 
Still need to add functionality
 2022-11-17 03:16:45 +01:00
PrairieWind db0b44326b Add crafting recipe item replacements 2022-11-17 03:16:45 +01:00
PrairieWind 4bb824cd38 Add mcl_honey mod.conf file along with translation templates 2022-11-17 03:16:45 +01:00
PrairieWind daf5bf90a4 Add Honey, Honeycomb, and respective blocks 2022-11-17 03:16:45 +01:00
cora d5b5d80a1a Merge pull request 'fix frames and signs to reset after /clearobjects' (#2919) from fix_clearobjs_signs_frames into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2919
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-17 02:09:00 +00:00
Michieal 9dc27e535b revert 020a9510cbd7adf7419c166af5c2baba7c96cf45 
revert "This has the achievement in there."

The only difference is the placement of a single comment, not worth a full on commit.
 2022-11-17 02:55:14 +01:00
Michieal 439ac600fd This has the achievement in there. 2022-11-17 02:55:14 +01:00
Michieal bee40c55ec Fix KillAura bug destroying the Displayed Item. 2022-11-17 02:55:14 +01:00