Skip to content

Finish Kat's collector#136

Merged
FourIsTheNumber merged 16 commits into
masterfrom
kat/collect-dn
Jun 11, 2026
Merged

Finish Kat's collector#136
FourIsTheNumber merged 16 commits into
masterfrom
kat/collect-dn

Conversation

@FourIsTheNumber

Copy link
Copy Markdown
Collaborator

Continuation of #50

Spicierspace153 and others added 11 commits November 4, 2025 20:43
# Conflicts:
#	src/main/java/com/fouristhenumber/utilitiesinexcess/ClientProxy.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/ModBlocks.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/config/blocks/BlockConfig.java
# Conflicts:
#	src/main/java/com/fouristhenumber/utilitiesinexcess/ClientProxy.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/ModBlocks.java
#	src/main/java/com/fouristhenumber/utilitiesinexcess/UtilitiesInExcess.java
@github-actions

github-actions Bot commented Jun 6, 2026

Copy link
Copy Markdown
Contributor

#137

Co-authored-by: GitHub GTNH Actions <33456283+FourIsTheNumber@users.noreply.github.com>
@FourIsTheNumber FourIsTheNumber enabled auto-merge (squash) June 11, 2026 13:37
@FourIsTheNumber FourIsTheNumber merged commit b434fb4 into master Jun 11, 2026
2 checks passed
@FourIsTheNumber FourIsTheNumber deleted the kat/collect-dn branch June 11, 2026 13:40
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