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

9719 Commits (bb73e5f1cd4e381d3062540bbf58c639b8398182)

Author SHA1 Message Date
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
Michieal 2577a70a65 Made displayed entities immortal 
Added in extended placement. 
Registered the Achievement "Glow and Behold!"
 2022-11-17 02:55:14 +01:00
Michieal e2e86ae9a8 Final commit 
Add in the ability to place frames on surfaces. Has minor visual bugs. Should be modified to disallow placing on top of items to prevent visual bugging.

Signed-off-by: Michieal <michieal@noreply.git.minetest.land>
 2022-11-17 02:55:14 +01:00
Michieal 577f9f7785 Change Frames to only use the timer if it's displaying an object. 2022-11-17 02:55:14 +01:00
Michieal 67296c7a37 Update Signs API to only use timer functions when there is text to display. 2022-11-17 02:55:14 +01:00
Michieal 4a1e37d9c6 fix typo that somehow propagated. 2022-11-17 02:55:14 +01:00
Michieal e67c6e1ada fix signs to reset after /clearobjects 
Additionally, added in the register_hanging_sing_craft() for future use.
 2022-11-17 02:55:14 +01:00
Michieal 10a3a022b6 fix frames to reset after /clearobjects 2022-11-17 02:55:14 +01:00
Michieal b2660e8c63 fix signs to reset after /clearobjects 
Also, added in register_hanging_sign_craft() for future use.
 2022-11-17 02:55:14 +01:00
Michieal c93f66295b fix frames to reset after /clearobjects 2022-11-17 02:55:14 +01:00
cora 4dba6a62cf Merge pull request 'Allow villagers to resettle and not run back to job and and old bed' (#2967) from feature/villager_pt_6 into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2967
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-17 01:52:52 +00:00
cora a28f667b20 Villagers only summon golems when monsters are near 2022-11-17 02:26:51 +01:00
ancientmarinerdev 1a670bc41b Allow villagers to resettle and not run back to job and and old bed 2022-11-17 02:26:51 +01:00
cora cdf28ec684 Merge pull request 'Fix the Pumpkin/Melon grass position.' (#2973) from gourd_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2973
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-17 01:24:36 +00:00
Michieal 99a7df7ce6 Fix the Pumpkin/Melon grass position. 
Also, updated the license.
 2022-11-17 02:16:59 +01:00
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 7630b1ca00 Merge pull request 'Fix crash when trying to place meshhand' (#2934) from fix_meshnode_crash into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2934
Reviewed-by: 𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 <mrrar@noreply.git.minetest.land>
 2022-11-16 18:33:24 +00:00
cora eeecc52ff8 Fix crash when trying to place meshhand 2022-11-16 12:23:39 -06:00
cora 661424ad23 Merge pull request 'better water visuals' (#2960) from better_visuals_water into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2960
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-16 16:14:38 +00:00
TheOnlyJoeEnderman 9e73c2cd46 Remove spaces on line 70 (71) 
Actually delete the spaces this time.
 2022-11-16 08:00:35 +00:00
TheOnlyJoeEnderman 50e6dd94b2 Code cleaning 
Remove outdated comment. Fix spaces on lines 40, 67, 70.
 2022-11-16 07:58:07 +00:00
epCode 7ed8370eb0 localize var/fix weather not changing brightness while underwater. 2022-11-15 22:36:06 +00:00