1.16 port

2020-07-22 16:44:42 +02:00
parent 662dbca3e1
commit 56ecda5173
225 changed files with 1214 additions and 969 deletions
@@ -38,7 +38,7 @@ public class ControllerBlock extends AEBaseTileBlock<ControllerTileEntity> {
        offline, online, conflicted;

        @Override
-        public String getName() {
+        public String getString() {
            return this.name();
        }

@@ -54,7 +54,7 @@ public class ControllerBlock extends AEBaseTileBlock<ControllerTileEntity> {
        block, column_x, column_y, column_z, inside_a, inside_b;

        @Override
-        public String getName() {
+        public String getString() {
            return this.name();
        }