mim
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity
7,876 Commits 67 Branches 76 Tags 158 MiB
Commit Graph

7876 Commits

Author SHA1 Message Date
cora 41ebaf12a5 Merge pull request 'fix indoor weather + multiplayer issue' (#2250) from weather_fixes into master 
Reviewed-on: MineClone2/MineClone2#2250
 2022-05-29 00:32:16 +00:00
cora a179a1cb62 fix indoor weather + multiplayer issue 2022-05-29 02:24:12 +02:00
cora 663e6dfe9e Merge pull request 'Add Parrot perching' (#2232) from parrot_perching_2 into master 
Reviewed-on: MineClone2/MineClone2#2232
 2022-05-29 00:22:52 +00:00
cora 7bc63d2882 fix mcl_mobs api_changes 2022-05-28 00:06:29 +02:00
cora c0a9cb7020 don't hurt perched parrot on punch 2022-05-28 00:05:04 +02:00
cora e90e17e533 clean up perch code, smoother behavior 2022-05-28 00:05:04 +02:00
cora 3d13000599 tweak detaching behavior 2022-05-28 00:05:04 +02:00
cora 86bc398a79 don't do flying animation while perching,fix anims 2022-05-28 00:05:04 +02:00
cora 14ec1aa014 add basic parrot perching 2022-05-28 00:05:04 +02:00
cora c1114211fc Merge pull request 'Fix crash on non existent xp-hud due to gamemode' (#2249) from fix-gamemode-xp into master 
Reviewed-on: MineClone2/MineClone2#2249
 2022-05-27 18:15:48 +00:00
cora ae2860d017 Show/Hide XP-hud immediately after gamemode switch 2022-05-27 19:56:47 +02:00
cora 1127231ca9 Fix crash on non existent xp-hud due to gamemode 2022-05-27 15:06:25 +02:00
cora ff6af32ddf Merge pull request 'mobs-redo mobitems breakup' (#2247) from mobs-redo-mobitem-breakup into master 
Reviewed-on: MineClone2/MineClone2#2247
 2022-05-27 00:54:01 +00:00
cora 4dba637ed8 readd lost horse armor inv images - confusing names 2022-05-27 02:44:39 +02:00
Lizzy Fleckenstein e7898352d8 Remove mobs_mc_gameconfig 2022-05-27 02:44:39 +02:00
cora d887a97310 Merge pull request 'Add entity cramming' (#2226) from entity_cramming into master 
Reviewed-on: MineClone2/MineClone2#2226
Reviewed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
 2022-05-26 12:21:46 +00:00
cora 47fa43825c count only mobs for cramming 2022-05-26 14:20:19 +02:00
cora af7dc0fb8f change "constant" declaration to match mcl_mobs 2022-05-26 14:16:38 +02:00
cora 87f50d6423 entity cramming: clean up check logic 2022-05-26 14:16:38 +02:00
cora fb4f21cba0 entity cramming: spare the children 2022-05-26 14:16:38 +02:00
cora 85b599edba entity cramming: check less often 2022-05-26 14:16:38 +02:00
cora b4cbc528a3 mcl_mobs: add entity_cramming 2022-05-26 14:16:38 +02:00
Lizzy Fleckenstein 96dcfb8a62 Merge pull request 'Strip trailing whitespace from files' (#2240) from EliasFleckenstein03/MineClone2:fmt into master 
Reviewed-on: MineClone2/MineClone2#2240
 2022-05-26 05:36:32 +00:00
Lizzy Fleckenstein f6a40ffb78
Run tools/strip_trailing_whitespace.sh 2022-05-26 07:29:28 +02:00
Lizzy Fleckenstein 6a054556cc
Add tool to strip trailing whitespace 2022-05-26 07:28:05 +02:00
cora 8210fba65b Merge pull request 'Mobs Redo Part 1' (#2245) from mobs-redo-basic-cleanup into master 
Reviewed-on: MineClone2/MineClone2#2245
 2022-05-25 21:19:07 +00:00
Lizzy Fleckenstein dd1f8cb59c Remove enderman gameconfig 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein ff33794487 Rename mobs global to mcl_mobs 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein e0f70b54ec Remove _cmi_is_mob 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein 4054f05a4c Remove support for invisibility mod 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein f6be8bac5a Remove checks for MCL2 mods 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein 8db9e76529 Remove unused version field 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein 6ae722a6ee Remove use_cmi 2022-05-25 23:13:33 +02:00
Lizzy Fleckenstein fc3992ceb6 Remove mobs.is_creative 2022-05-25 23:13:33 +02:00
cora d3afccad64 Merge pull request 'Fix warnings in mcl_bells and mcl_beds' (#2243) from EliasFleckenstein03/MineClone2:warn into master 
Reviewed-on: MineClone2/MineClone2#2243
 2022-05-25 17:54:28 +00:00
Lizzy Fleckenstein 569288b782
Fix warnings in mcl_bells and mcl_beds 2022-05-25 19:37:36 +02:00
cora 950a0607f1 Merge pull request 'Add /gamemode command for per player gamemode' (#2235) from creative_gamemode_2 into master 
Reviewed-on: MineClone2/MineClone2#2235
Reviewed-by: Elias Fleckenstein <eliasfleckenstein@web.de>
 2022-05-25 14:43:06 +00:00
cora d863a6298b fix/simplifiy things from review 2022-05-25 16:36:04 +02:00
cora 2499fe1e83 add complete input validation, better result msgs 2022-05-25 05:43:49 +02:00
cora f89780695e Add /gamemode command for per player gamemode 2022-05-25 05:43:49 +02:00
cora e2fc41cf51 Merge pull request 'Fix wrong argument to is_creative_enabled' (#2237) from fix_wtong_is_creative_usage into master 
Reviewed-on: MineClone2/MineClone2#2237
 2022-05-25 03:42:12 +00:00
cora 6a2f9e1a16 Fix wrong argument to is_creative_enabled 2022-05-25 03:41:43 +00:00
cora efbf3d9750 Merge pull request 'make soul fire drop nothing when dug' (#2238) from fix_soul_fire_drop into master 
Reviewed-on: MineClone2/MineClone2#2238
 2022-05-25 03:40:54 +00:00
cora bda5073d86 make soul fire drop nothing when dug 2022-05-25 05:27:52 +02:00
cora 8ad9dd0b86 Merge pull request 'Add blackstone by debian044' (#2142) from blackstone into master 
Reviewed-on: MineClone2/MineClone2#2142
 2022-05-24 11:29:12 +00:00
cora 11e8e7d4cc Add soul_group to s.soil&sand, torch fix recpipe 2022-05-24 13:25:59 +02:00
kabou 1931a85f24 Add blackstone to cobble group. 
By adding blackstone to the group "cobble", it automatically inherits
all crafting recipes and tool repair capabilities that apply to that
group.

* Add `cobble=1` to blackstone node definition groups.
* Remove stone tools and furnace crafting recipes.
 2022-05-24 13:25:45 +02:00
cora 0c65363a09 replace ' with " 2022-05-24 13:25:45 +02:00
cora b6a647e119 remove unused vars 2022-05-24 13:25:45 +02:00
cora 23e5a1c7d3 Comment out ore generation for now 
The discussion about how to handle this is still ongoing. Since
this is about getting the new nodes disable ore registration
for now.
 2022-05-24 13:25:45 +02:00