Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.19.2/update #624

Merged
merged 181 commits into from
Nov 19, 2023
Merged

1.19.2/update #624

merged 181 commits into from
Nov 19, 2023

Conversation

mrsterner
Copy link
Contributor

The new stuff from 1.18 ported to 1.19

StewStrong and others added 30 commits July 19, 2023 19:45
* Update misc.json

bedrock weight more realistic now

* Update misc.json

coal is normal again
@CLAassistant
Copy link

CLAassistant commented Nov 16, 2023

CLA assistant check
All committers have signed the CLA.

# Conflicts:
#	common/build.gradle
#	common/src/main/java/org/valkyrienskies/mod/mixin/client/multiplayer/MixinClientPacketListener.java
#	common/src/main/java/org/valkyrienskies/mod/mixin/client/renderer/MixinLevelRenderer.java
#	common/src/main/java/org/valkyrienskies/mod/mixin/server/MixinPlayerList.java
#	common/src/main/java/org/valkyrienskies/mod/mixin/server/command/MixinCommands.java
#	common/src/main/java/org/valkyrienskies/mod/mixin/server/network/MixinServerGamePacketListenerImpl.java
#	common/src/main/java/org/valkyrienskies/mod/mixin/server/world/MixinServerLevel.java
#	common/src/main/kotlin/org/valkyrienskies/mod/client/audio/SimpleSoundInstanceOnShip.kt
#	common/src/main/kotlin/org/valkyrienskies/mod/common/command/RelativeVector3Argument.kt
#	common/src/main/kotlin/org/valkyrienskies/mod/common/command/ShipArgument.kt
#	common/src/main/kotlin/org/valkyrienskies/mod/common/command/VSCommands.kt
#	common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipAssemblerItem.kt
#	common/src/main/kotlin/org/valkyrienskies/mod/common/item/ShipCreatorItem.kt
#	common/src/main/kotlin/org/valkyrienskies/mod/compat/clothconfig/VSClothConfig.kt
#	fabric/build.gradle
#	fabric/gradle.properties
#	fabric/src/main/java/org/valkyrienskies/mod/fabric/mixin/world/level/block/FireMixin.java
#	fabric/src/main/kotlin/org/valkyrienskies/mod/fabric/common/ValkyrienSkiesModFabric.kt
#	fabric/src/main/resources/valkyrienskies-fabric.mixins.json
#	forge/build.gradle
#	forge/gradle.properties
#	forge/src/main/java/org/valkyrienskies/mod/forge/mixin/world/level/block/FireMixin.java
#	forge/src/main/kotlin/org/valkyrienskies/mod/forge/common/ValkyrienSkiesModForge.kt
#	gradle.properties
@Rubydesic
Copy link
Contributor

This is awesome!

@StewStrong StewStrong merged commit b370b41 into ValkyrienSkies:1.19.2/main Nov 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants