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

9675 Commits (9893dee1aa6d9cc74856f1d669b96a48602b688d)

Author SHA1 Message Date
cora 9893dee1aa Add debug chatcommand to start events 2022-11-26 17:06:04 +01:00
cora 232f57c247 Add hero of the village achievement 2022-11-26 17:06:04 +01:00
cora dc017864fd raids: properly integrate potions api 
supports "level" now, bad omen > 1 means extra wave additionally
the playername is saved in the event object now for later access
and events can be made exclusive to a certain radius now.
 2022-11-26 17:06:04 +01:00
cora 2159edba05 Remove dependency on mcl_potions 2022-11-26 17:06:04 +01:00
cora 37144f8787 Check for actual raid conditions and positions 2022-11-26 17:06:04 +01:00
cora 7ab2c5fecd Make debug output an opt-in setting 2022-11-26 17:06:04 +01:00
cora 99fce095ef fix closure style function declarations 
its BANNED in CONTRIB.md
 2022-11-26 17:06:04 +01:00
cora 390aec5d7a Integrate raids with mcl_events 2022-11-26 17:06:04 +01:00
cora 052e76bfcc start at effective stage 1 2022-11-26 17:06:04 +01:00
cora f17a9220bb Add bossbar support 2022-11-26 17:06:04 +01:00
cora 627ce0dc3b Finish at max_stage not max_stage + 1 2022-11-26 17:06:04 +01:00
cora f06d5a1ee3 Add event api 
prototype state, test with chatcommand /infest (debug priv)
 2022-11-26 17:06:03 +01:00
PrairieWind 5dc1a3d456 Village Finder Tweaks 2022-11-26 17:06:03 +01:00
PrairieWind 1b6d778dd1 Add Village Checks 2022-11-26 17:06:03 +01:00
PrairieWind 96ac31bec3 Add Bad Omen Effect 2022-11-26 17:06:03 +01:00
PrairieAstronomer 8b6409b7f1 Add mcl_raids 2022-11-26 17:06:03 +01:00
cora 6e6f163b71 Merge pull request 'Fix pressure plates getting pressed by new chest size' (#3019) from pressureplates_chest_fix into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3019
 2022-11-26 16:03:53 +00:00
cora ba7da6a885 Fix pressure plates being pressed by new chest size 
this fixes the problem for chests, with paintings it would need to
go down considerably ( .65 was the value i determined)
 2022-11-26 16:52:19 +01:00
cora 3066d966a1 Add the missing wood types pressure plates 2022-11-26 16:52:19 +01:00
cora 626f61c2c1 Merge pull request 'Nether Plank Fixes' (#3023) from FossFanatic/MineClone2:nether_plank_fixes into master 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3023
Reviewed-by: cora <cora@noreply.git.minetest.land>
 2022-11-26 12:58:21 +00:00
FossFanatic f71759f184 Fix crimson & warped planks 2022-11-26 11:54:34 +00: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