CarryOn/Common/src/main/java/tschipp/carryon/client
Tschipp d4e0b29a06 Merge branch '1.21.9' of github.com:Hanro50/CarryOn into Hanro50-1.21.9
# Conflicts:
#	Common/src/main/java/tschipp/carryon/CarryOnCommon.java
#	Common/src/main/java/tschipp/carryon/CarryOnCommonClient.java
#	Common/src/main/java/tschipp/carryon/client/keybinds/ConflictFreeKeyMapping.java
#	Common/src/main/java/tschipp/carryon/client/render/CarriedObjectRender.java
#	Common/src/main/java/tschipp/carryon/mixin/AvatarRenderStateMixin.java
#	Common/src/main/java/tschipp/carryon/mixin/HumanoidModelMixin.java
#	Common/src/main/resources/carryon.mixins.json
#	Fabric/build.gradle
#	build.gradle
#	gradle.properties
2025-12-23 11:51:53 +01:00
..
keybinds Merge branch '1.21.9' of github.com:Hanro50/CarryOn into Hanro50-1.21.9 2025-12-23 11:51:53 +01:00
modeloverride Fixed 3rd person rendering 2025-10-24 22:27:31 +02:00
render Merge branch '1.21.9' of github.com:Hanro50/CarryOn into Hanro50-1.21.9 2025-12-23 11:51:53 +01:00