Skip to content

Commit

Permalink
merge with main branch
Browse files Browse the repository at this point in the history
Update Settings.java
  • Loading branch information
MCTBL committed Nov 11, 2023
1 parent 4323385 commit 8872428
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,6 @@ runClient17Task.configure {
mainClass = "GradleStart"
username = minecraft.username
userUUID = minecraft.userUUID
jvmArgs "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005"
}

def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/appeng/api/config/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public enum Settings {

CRAFTING_MODE(EnumSet.allOf(CraftingMode.class)),

CELL_TYPE(EnumSet.allOf(CellType.class));
CELL_TYPE(EnumSet.allOf(CellType.class)),

STICKY_MODE(EnumSet.of(YesNo.YES, YesNo.NO));

Expand Down

0 comments on commit 8872428

Please sign in to comment.