Gustavo6046
/
MineClone5
forked from MineClone5/MineClone5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
8,216 Commits 26 Branches 0 Tags 70 MiB
Commit Graph

8216 Commits

Author SHA1 Message Date
kay27 f207832c5a Merge master into testing 2022-01-10 19:38:12 +04:00
kay27 16116df4c6 Generate only desert seeds for some structs and lots of debugging glass blocks in the sky 2022-01-10 19:35:04 +04:00
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
GuyLiner cade03cedf Merge branch 'master' into spawner 2022-01-07 15:40:45 +00:00
kay27 667ebf1385 Fix several mapgen_issue warnings 2022-01-07 08:41:04 +04:00
GuyLiner bdc5252c59 Merge branch 'master' into rotate_fix 2022-01-07 03:18:15 +00:00
kay27 da8e92e071 Fix layers 2022-01-07 07:16:31 +04:00
kay27 7868cf7dc5 Merge master into mapgen_issue 2022-01-07 06:47:11 +04:00
kay27 726159e796 Dedicate clay and structures from mapgen core 2022-01-07 06:24:11 +04:00
epCode 9b881df465 Temporarily remove glitchy Elytra crash-damage 
If you fly in certain directions with this damage system, you will die. also if you speed up too fast.
 2022-01-06 21:55:01 +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
GuyLiner 66a96daad4 Merge branch 'master' into rotate_fix 2022-01-05 22:42:23 +00:00
GuyLiner 731bbaec79 Merge branch 'master' into spawner 2022-01-05 22:34:46 +00:00
kay27 54adfe9e30 Merge remote-tracking branch 'origin/testing' into mapgen_issue 2022-01-06 02:07:16 +04: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
Guy Liner 502f85f637 Added a file that contains a table of every monsters light spawning levels 2022-01-05 10:45:15 -05:00
Guy Liner a9eb6cb747 Moved that table that contains every monster's light spawning levels to a different file, added some comments 2022-01-05 10:44:01 -05:00
Guy Liner 04a81af4a1 Make sure that the player is not in creative mode before giving them experience points 2022-01-05 10:42:50 -05:00
Guy Liner 385d34df33 Added comments and figured out away to fix mob spawning bug 2022-01-04 23:15:48 -05: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
kay27 980e592e4a Merge pull request 'Release 0.71.14 Spawn Ender Dragon' (#106) from testing into production 
Reviewed-on: MineClone5/MineClone5#106
 2022-01-05 02:52:58 +00:00
kay27 806edcda19 Fix crash at startup 2022-01-05 06:47:06 +04:00
kay27 6c1d30a130 Polish new mapgen stuff 2022-01-05 06:43:16 +04: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 4ce3102ab4 Merge remote-tracking branch 'origin/testing' into mapgen_issue 2022-01-05 04:18:39 +04:00
kay27 b703dbc288 Merge remote-tracking branch 'origin/master' into testing 2022-01-05 04:18:07 +04: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 05f1614893 #62 Spawn Ender Dragon 2022-01-04 04:13:28 +04:00
kay27 91fd78f38f Merge branch 'master' into mapgen_issue 2022-01-04 00:43:52 +04:00
Lizzy Fleckenstein a8b974266c Merge pull request 'Add 1024x1024 logo (basic and small versions)' (#1947) from AFCMS/MineClone2:new_logo into master 
Reviewed-on: MineClone2/MineClone2#1947
 2022-01-03 17:49:54 +00:00
kay27 7464a4721d Merge remote-tracking branch 'origin/production' 2022-01-03 20:15:42 +04:00
kay27 bcb93fb49c Merge master into mapgen_issue 2022-01-03 20:12:50 +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
Guy Liner f4e7911903 Removed a comment that was not needed and added a new line below the comment block 2022-01-02 17:32:43 -05:00