Skip to content

Commit eeabc65

Browse files
committed
Merge branch 'dev' into release/1.20.2
# Conflicts: # gradle/libs.versions.toml
2 parents 01e398b + cfc9848 commit eeabc65

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

OptiGUI/src/main/resources/fabric.mod.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"minecraft:trapped_chest": "minecraft:textures/gui/container/generic_54.png",
115115
"minecraft:chest_boat": "minecraft:textures/gui/container/generic_54.png",
116116
"minecraft:chest_minecart": "minecraft:textures/gui/container/generic_54.png",
117+
"minecraft:crafter": "minecraft:textures/gui/container/crafter.png",
117118
"minecraft:crafting_table": "minecraft:textures/gui/container/crafting_table.png",
118119
"minecraft:dispenser": "minecraft:textures/gui/container/dispenser.png",
119120
"minecraft:dropper": "minecraft:textures/gui/container/dispenser.png",

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
java = "17" # Don't forget to update *.mixins.json
33
kotlin = "1.9.22"
4-
optigui = "2.3.0-beta.3+1.20.2"
4+
optigui = "2.3.0-beta.4+1.20.2"
55
minecraft = "1.20.2"
66
yarn = "1.20.2+build.4"
77
fabric-loom = "1.5-SNAPSHOT"

0 commit comments

Comments
 (0)