Skip to content

Commit

Permalink
Merge branch 'master' into 1.19
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/resources/fabric.mod.json
  • Loading branch information
Treetrain1 committed Sep 3, 2022
2 parents b99053c + b112a18 commit e0029c1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
]
},
"mixins": [
"wilderwild.mixins.json",
"quiltmc_datafixerupper.mixins.json"
"wilderwild.mixins.json",
"quiltmc_datafixerupper.mixins.json"
],
"accessWidener": "wilderwild.accesswidener",
"depends": {
Expand Down

0 comments on commit e0029c1

Please sign in to comment.