diff options
| author | Roman / Linnea Gräf <nea@nea.moe> | 2023-03-31 18:21:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-31 18:21:22 +0200 |
| commit | 70ae0e8d2d7011cc774c9021b5a6aa83c2fa670e (patch) | |
| tree | c1d8740fea089adf2d76c525ad32139fa46b789b | |
| parent | c721ae4a5c2d63b37a6a33fb1fe60bb4e7cb791e (diff) | |
| parent | c0e13b2c33ace3d22639088266454a8c57200d12 (diff) | |
| download | SkyHanni-70ae0e8d2d7011cc774c9021b5a6aa83c2fa670e.tar.gz SkyHanni-70ae0e8d2d7011cc774c9021b5a6aa83c2fa670e.tar.bz2 SkyHanni-70ae0e8d2d7011cc774c9021b5a6aa83c2fa670e.zip | |
Merge branch 'beta' into feat/rancheroverlay
3 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java index 5554f8a07..3381c1bd7 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Garden.java @@ -246,7 +246,7 @@ public class Garden { @Expose @ConfigOption( name = "Always On", - desc = "Show the Best Display always while on the ") + desc = "Show the Best Display always while on the garden.") @ConfigEditorBoolean @ConfigAccordionId(id = 7) public boolean cropMilestoneBestAlwaysOn = false; @@ -682,7 +682,7 @@ public class Garden { @Expose @ConfigOption(name = "Composter", desc = "") - @ConfigEditorAccordion(id = 16) + @ConfigEditorAccordion(id = 17) public boolean composter = false; @Expose @@ -691,7 +691,7 @@ public class Garden { desc = "Displays the compost data from the tab list in a compact form as gui element." ) @ConfigEditorBoolean - @ConfigAccordionId(id = 16) + @ConfigAccordionId(id = 17) public boolean composterDisplayEnabled = true; @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayers.java b/src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayers.java index 89d5a624c..6cdb94590 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayers.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/MarkedPlayers.java @@ -1,6 +1,5 @@ package at.hannibal2.skyhanni.config.features; -import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager; import com.google.gson.annotations.Expose; import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; import io.github.moulberry.moulconfig.annotations.ConfigOption; @@ -18,6 +17,7 @@ public class MarkedPlayers { @ConfigEditorBoolean public boolean highlightInChat = true; + @Expose @ConfigOption(name = "Mark Own Name", desc = "Mark own player name.") @ConfigEditorBoolean() public Property<Boolean> markOwnName = Property.of(false); diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt index d81702ffd..1d71c8553 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/CropType.kt @@ -19,6 +19,9 @@ enum class CropType(val cropName: String, val toolName: String, iconSupplier: () ; val icon by lazy { iconSupplier() } + override fun toString(): String { + return cropName + } companion object { fun getByName(name: String) = values().firstOrNull { it.cropName == name } |