Merge remote-tracking branch 'origin/master' into fabric-1.16

# Conflicts: # src/main/java/appeng/block/AEBaseBlockItem.java # src/main/java/appeng/core/AEConfig.java # src/main/java/appeng/parts/PartPlacement.java
2020-07-02 01:15:30 +02:00
parent 3b4302583d f573b52b1b
commit dd9346e53f
5 changed files with 53 additions and 25 deletions
@@ -159,9 +159,10 @@ public final class AEConfig {
        this.matterCannonBattery = commonConfig.matterCannonBattery.get();

        this.featureFlags.clear();
+
        for (final AEFeature feature : AEFeature.values()) {
-            if (feature.isVisible()) {
-                if (commonConfig.enabledFeatures.containsKey(feature)) {
+            if (feature.isVisible() && feature.isConfig()) {
+                if (commonConfig.enabledFeatures.containsKey(feature) && commonConfig.enabledFeatures.get(feature).get()) {
                    this.featureFlags.add(feature);
                }
            } else {