chmodsayshello
/
MineClone5
forked from MineClone5/MineClone5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Test Pull Request #4

Closed
chmodsayshello wants to merge 718 commits from Lodestone into mcl_sus_stew
pull from: Lodestone
merge into: chmodsayshello:mcl_sus_stew
Conversation 1 Commits 718 Files Changed 691 +16585 -20172
chmodsayshello commented 2022-03-26 13:12:09 +01:00
Owner
Copy Link

This gets closed soon without merging

This gets closed soon without merging
chmodsayshello added 718 commits 2022-03-26 13:12:11 +01:00
3e72d1dcb5
[mcl_amethyst] INIT 
* Amethyst Block
* Budding Amethyst (won't  grow amethyst now)
* New spyglass recipe
* Tinted Glass
* Calcite
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
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.
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.
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.
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.
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.
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.
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.
978f23c70e mcl_mapgen_core: Rename cocoa to c_cocoas. 
This is more consistent and should hopefully be clearer.
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.
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.
bc3ecb175e Merge remote-tracking branch 'spawner/spawner' into spawner 
These are my changes that fix a spawning bug that allowed monsters
to spawn no matter what light level if you had manually created
the spawner
49201116e8 Fixes problem where pillar like nodes could not be placed on 
nodes that had the "on_rightclick" attribute.
Merge remote-tracking branch 'mcl2/rotate_fix' into rotate-fix
4c85f85422 Added poison to cave spider attack 
Converted melee cave spider punch to custom, ultra low range, poison spit. The attack serves as a functional stop gap until punch augmentation is implemented in the mcl_mobs API  (if that is decided to be done). The attack does 2 initial damage + 4 poison damage over 8 seconds (better fraction that Minecraft's weird 4 damage over 7 seconds) Credits have been added where necessary.
d3711b69a5 Fixed bug where cave spider poison effect would continue after respawn 
Also added knockback effect to cave spider attack and set default cave spider health to current Minecraft default.
8bfa248ef7 set privs only when changed 
setting privileges causes mt to write to the player db. this
changes shields so it only sets the interact privilege when
it has actually changed.
5cda117073 set hud flags only when changed 
Setting hud flags (and other player properties) when they have not
changed results in unneccessary network traffic.
011423ac6d Fix TGA file writing on Windows 
Before this patch, the tga_encoder mod would write corrupted TGA files
on Windows: Bytes that looked like newlines were replaced by a carriage
return and a newline.
b952b79283 Merge pull request 'Some Chinese translate' (#207) from 1798643961/MineClone5:master into master 
Reviewed-on: MineClone5/MineClone5#207

Oh, what's the user id? Have no idea how to mention it. Emojigit?

Many thanks for translating it!
aca900023c mcl_composters initial commit 
Implements a composter block with crafting recipe, and some more
uncraftable blocks representing various stages of filling.

Adds a list of items that can be used with the composter and the chances
of these items adding a layer to the composter.

Implements methods to add compostable items to the composter, to update
the composter to various levels of compost and to harvest an item of
bone meal when the composter is ready.

Textures were taken from XSSheep/Nova_Wostra Pixel Perfection texture
pack.
0d68282b81 Fix composter item image 
* Less is more (thanks AFCMS)
1e72c1243b Update documentation. 
* Make a mention of the one second delay before composter readies.
72aba1d8bb Typo fix. 
* it's a spruceSapling (thanks NO11)
9ef9530c04 Update mod deps 
* Add dependency on mcl_dye for bone meal particle spawner.
4cb3c6d51b Add player object check. 
* Handle the case where a mob somehow "clicks" on a composter and we get
  an invalid player object passed.
77b020e1ec Add missing melon block. 
* Add melon block to the compostabiles list.
b138357b11 Update mod description and fix comment. 
* Make mod description more descriptive.
* Minor comment tweak.
3494fa80b5 Comment fixes. 
* Improve comments, some typo fixes.
f6ec8e94d2 Add help alias 
* Add help alias for the ready type composter
b8af8cacd5 Add player object check. 
* Add one more check if player object is an actual player.
4e5cc0cb2b Change custom node attribute name. 
* Rename _compost_level to _mcl_compost_level
0e48a29787 Optimize texture files. 
* Texture files were optimized with 'optipng  -o7 -zm9 -strip all' .
87f9ef7bc9 mcl_shields.fr.tr 
french translation
ba5474f5d4 limit redstone distance by checking for players 
This should probably be implemented by having redstone signals
lose strength like in mc. This just prevents redstone action
further than 40 nodes from each player.
7ad5f7c66e Incorrect fortune effect on a non-ore 
This Easter Egg had almost a year. Time to put it to bed.
9e72966f91 missed the comma on the previous line 
When removing the last line the previous comma wasn't removed.
chmodsayshello commented 2022-03-26 13:13:48 +01:00
Author
Owner
Copy Link

Test complete, closing without merging

Test complete, closing without merging
chmodsayshello closed this pull request 2022-03-26 13:13:48 +01:00

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: chmodsayshello/MineClone5#4
No description provided.
Delete Branch "Lodestone"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?