aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
diff options
context:
space:
mode:
authorDoKM <mcazzyman@gmail.com>2021-07-22 09:57:31 +0200
committerDoKM <mcazzyman@gmail.com>2021-07-22 09:57:31 +0200
commitbefa3f0f8aeb0166bf84dddd14f6b4fabc236cf0 (patch)
tree4ef5014cf74f57ef52fa2650703de7b8f1153f6c /src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
parentaebc16a2a5ca9c20affc27eb5a45cd9a95085168 (diff)
parentc1c4562b42d53ec2e8885c48f97249d7768fe1c7 (diff)
downloadnotenoughupdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.tar.gz
notenoughupdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.tar.bz2
notenoughupdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.zip
Fix merge conflicts for moulberry
Diffstat (limited to 'src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
index 37a60b1b..a20e5abb 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/StorageManager.java
@@ -226,7 +226,7 @@ public class StorageManager {
}
public boolean shouldRenderStorageOverlay(String containerName) {
- if(!NotEnoughUpdates.INSTANCE.config.storageGUI.enableStorageGUI) {
+ if(!NotEnoughUpdates.INSTANCE.config.storageGUI.enableStorageGUI2) {
shouldRenderStorageOverlayCached = false;
return false;
}