Skip to content

Conversation

@Spicierspace153
Copy link
Contributor

No description provided.

YoungOnionMC and others added 18 commits September 20, 2025 12:22
…rs-PackForge/CosmicCore into yo/ticon-modifiers

# Conflicts:
#	src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicCreativeTinkersTab.java
#	src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicTinkerTools.java
#	src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicToolDefinitionProvider.java
#	src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicToolDefinitions.java
what the fuck
this game is so shitty.
# Conflicts:
#	src/main/resources/cosmiccore.mixins.json
@Spicierspace153 Spicierspace153 marked this pull request as ready for review September 24, 2025 02:37
@Spicierspace153 Spicierspace153 merged commit af84c7c into gp/the-great-retinkering Sep 24, 2025
1 check passed
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.

3 participants