kay27
30ab997358
Merge pull request 'Really move mcl_stairs_stone_slab_top.png into mcl_core' ( #112 ) from djc/MineClone5:polished-stone into master
...
Reviewed-on: MineClone5/MineClone5#112
2022-01-07 23:09:21 +00:00
Daniel Cassidy
d0d7ebe53b
Really move mcl_stairs_stone_slab_top.png into mcl_core
...
This is a fix for #105 where I accidentally moved it to the wrong place.
Sorry.
mcl_core uses this texture for Polished Stone (mcl_core:stone_smooth),
which means mcl_core had an undeclared dependency on mcl_stairs.
Since mcl_stairs depends on mcl_core, it makes sense to move the texture
to mcl_core.
2022-01-07 21:56:37 +00:00
kay27
0693afe869
Merge pull request 'mcl_mapgen_core: Make most dependencies optional' ( #109 ) from djc/MineClone5:optional-deps into master
...
Reviewed-on: MineClone5/MineClone5#109
2022-01-06 11:07:50 +00:00
Daniel Cassidy
978f23c70e
mcl_mapgen_core: Rename cocoa to c_cocoas.
...
This is more consistent and should hopefully be clearer.
2022-01-06 02:56:51 +00:00
Daniel Cassidy
802d214d7b
mcl_mapgen_core: Make mcl_nether an optional dependency.
...
mcl_nether was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
2022-01-06 02:55:33 +00:00
Daniel Cassidy
a0708abb9c
mcl_mapgen_core: Make mcl_mushrooms an optional dependency.
...
mcl_mushrooms was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
2022-01-06 02:46:02 +00:00
Daniel Cassidy
554f22b802
mcl_mapgen_core: Make mcl_farming an optional dependency.
...
mcl_farming was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
2022-01-06 02:33:04 +00:00
Daniel Cassidy
1d03a3d150
mcl_mapgen_core: Make mcl_flowers an optional dependency.
...
mcl_flowers was previously an undeclared dependency of mcl_mapgen_core.
Now it is both optional and declared.
2022-01-06 02:30:24 +00:00
Daniel Cassidy
7c72ce1d0d
mcl_mapgen_core: Fix check for wrong mod.
2022-01-06 02:11:06 +00:00
Daniel Cassidy
2bdaa77932
mcl_mapgen_core: Make mcl_structures an optional dependency.
2022-01-06 01:20:06 +00:00
Daniel Cassidy
5cad35dbfe
mcl_mapgen_core: Make mcl_stairs an optional dependency.
...
The "mapgen_stair" aliases are only used by v6, and even then appear to
be optional in practice, so there's no reason for mcl_mapgen_core to
require mcl_stairs.
2022-01-06 01:20:06 +00:00
Daniel Cassidy
51cdc69b99
mcl_mapgen_core: Make mcl_monster_eggs an optional dependency.
...
The only purpose of this dependency appears to be to force
mcl_monster_eggs to load before mcl_mapgen_core. It is not actually
used in the code.
mcl_monster_eggs is an undeclared dependency of mobs_mc_gameconfig,
mcl_biomes, and mcl_structures, all of which are either transitive
or direct dependencies of mcl_mapgen_core.
It's not possible to add a dependency on mcl_monster_eggs directly
to mobs_mc_gameconfig, because that would lead to a circular
dependency. So it seems like a dependency on mcl_monster_eggs is
declared as a dependency of mcl_mapgen_core as a workaround to
ensure that mcl_monster_eggs at least gets loaded before
mcl_mapgen_core.
I've moved mcl_monster_eggs to the optional dependencies which
should achieve the same aim without complaining if mcl_monster_eggs
is missing, but this should probably be cleaned up in future to
remove the circular dependency.
2022-01-06 01:18:40 +00:00
Daniel Cassidy
b73c0e8f2c
mcl_mapgen_core: Make mcl_ocean an optional dependency.
2022-01-05 21:34:56 +00:00
Daniel Cassidy
012d0bd942
mcl_mapgen_core: Make mcl_sponges an optional dependency.
2022-01-05 20:52:53 +00:00
Daniel Cassidy
c52f598e64
mcl_mapgen_core: Make mcl_cocoas an optional dependency.
2022-01-05 20:46:28 +00:00
kay27
fc3dc63f01
Merge pull request 'Move texture mcl_stairs_stone_slab_top to mcl_core.' ( #105 ) from djc/MineClone5:polished-stone into master
...
Reviewed-on: MineClone5/MineClone5#105
2022-01-05 03:05:20 +00:00
Daniel Cassidy
af03b030a0
Move texture mcl_stairs_stone_slab_top to mcl_core.
...
mcl_core uses this texture for Polished Stone (mcl_core:stone_smooth),
which means mcl_core has an undeclared dependency on mcl_stairs.
Since mcl_stairs depends on mcl_core, it makes sense to move the texture
to mcl_core.
2022-01-05 02:33:31 +00:00
kay27
1d9a96a2f9
Merge pull request 'mcl_enchanting: Add missing dependency on mcl_experience' ( #104 ) from djc/MineClone5:missing-dep into master
...
Reviewed-on: MineClone5/MineClone5#104
2022-01-04 23:55:42 +00:00
Daniel Cassidy
841c278490
mcl_enchanting: Add missing dependency on mcl_experience.
2022-01-04 23:46:54 +00:00
kay27
7464a4721d
Merge remote-tracking branch 'origin/production'
2022-01-03 20:15:42 +04:00
kay27
219981081b
Merge pull request 'Release 0.71.13' ( #92 ) from testing into production
...
Reviewed-on: MineClone5/MineClone5#92
2022-01-03 04:23:51 +00:00
kay27
310aba9c11
Fix Nether dust
2022-01-03 08:16:56 +04:00
kay27
7a1cdc89fb
#35 Fix floating slimes
2022-01-03 08:08:56 +04:00
kay27
698c29733f
#38 Fix cauldrons
2022-01-03 07:42:33 +04:00
kay27
6a323c376a
Merge pull request 'Merge 0.71.12 into master' ( #79 ) from production into master
...
Reviewed-on: MineClone5/MineClone5#79
2022-01-02 13:47:59 +00:00
NO11
9d53c36c0a
Merge pull request 'Make removing of arrow entities also work with mobs, remove arrows on respawn' ( #78 ) from arrow_fix into master
...
Reviewed-on: MineClone5/MineClone5#78
2022-01-02 11:08:18 +00:00
NO11
8c6d016527
Make removing of arrow entities also work with mobs, remove arrows on respawn
2022-01-02 11:07:43 +00:00
kay27
9b4cbb6cda
Merge branch 'master' into testing
2022-01-02 12:03:32 +04:00
kay27
9e8d02413e
Merge pull request 'Added Suspicious Stews (New Pull Request)' ( #67 ) from chmodsayshello/MineClone5:SuspiciousStew2 into master
...
Reviewed-on: MineClone5/MineClone5#67
2022-01-02 07:57:31 +00:00
kay27
f9dab6a635
Merge pull request 'Release 0.71.12' ( #77 ) from testing into production
...
Reviewed-on: MineClone5/MineClone5#77
2022-01-02 07:31:17 +00:00
kay27
027753940f
Add dummy /gamemode
2022-01-02 10:58:29 +04:00
kay27
c2256bc4b7
Revert solar panel revert from MCL2 - more testing needed
2022-01-02 03:16:05 +04:00
kay27
77ac660c7b
Merge remote-tracking branch 'mcl2/master' into testing
2022-01-02 03:12:55 +04:00
kay27
b4fa82d2ab
Merge remote-tracking branch 'origin/master' into testing
2022-01-02 03:11:52 +04:00
kay27
7ecf316c48
#55 Fix boat visual size again
2022-01-02 03:11:10 +04:00
NO11
31c2ec359a
Merge pull request 'Remove arrow entities when the player joins to prevent killing on startup (working fix)' ( #74 ) from arrow_fix into master
...
Reviewed-on: MineClone5/MineClone5#74
2022-01-01 23:01:34 +00:00
NO11
cbf497e68b
Merge branch 'master' into arrow_fix
2022-01-01 23:01:01 +00:00
NO11
53860a8f79
Remove arrow entities when the player joins to prevent killing on startup (working fix)
2022-01-01 23:00:02 +00:00
NO11
7b46225176
Remove arrow entities when the player joins to prevent killing on startup (working fix)
2022-01-01 22:59:21 +00:00
cdab29a42e
replaced old itemstring
2022-01-01 13:52:38 +00:00
fa892e880e
removed the code I used during debugging
...
Now, suspicious stews are no longer in the creative inventory, and have to be crafted or obtained using /giveme
2022-01-01 12:23:13 +00:00
a03e532a85
upload the texture for the suspicious stew
2022-01-01 12:19:50 +00:00
4a2b07115a
added new dependencies (everything required is within mineclone5)
2022-01-01 12:18:29 +00:00
c263d1a622
registered suspicious_stew.lua within mcl_mushrooms
2022-01-01 12:17:29 +00:00
b6567ee11c
upload the code for the suspicious stew(s)
2022-01-01 12:15:04 +00:00
ff433e65fe
added Nova_Wostra (creator of Pixel Perfection Legacy) to the credits
2022-01-01 12:13:22 +00:00
kay27
7dfe9a3356
Merge master into testing
2021-12-31 02:37:17 +04:00
kay27
4e2fa3b854
Merge pull request 'Added debian44 to Community' ( #57 ) from debiankaios-credits-patch-1 into master
...
Reviewed-on: MineClone5/MineClone5#57
2021-12-30 22:36:43 +00:00
kay27
cd3f9bc40f
Merge master into testing
2021-12-31 02:34:34 +04:00
kay27
b2df02a4d2
Merge pull request 'loaded crossbows are no longer in creative inventory' ( #60 ) from chmodsayshello/MineClone5:crosbow_inventory_fix into master
...
Reviewed-on: MineClone5/MineClone5#60
2021-12-30 22:33:16 +00:00
kay27
Daniel Cassidy
NO11
chmodsayshello