diff options
| author | Unknown <shekwancheung0528@gmail.com> | 2019-04-30 20:16:40 +0800 |
|---|---|---|
| committer | Unknown <shekwancheung0528@gmail.com> | 2019-04-30 20:16:40 +0800 |
| commit | 6345d24492242ba9ea26c6b83163aa81464c8cfd (patch) | |
| tree | c27abf2db7b9c5a2b549ed0a57a9cee338d3e441 /src/main/resources | |
| parent | 84ec7057e25602a8705efc5ee1b34c8f05184ea4 (diff) | |
| parent | a7e0b3e2bfbdefdd7eee4dc108e7e6e4fce5da33 (diff) | |
| download | RoughlyEnoughItems-6345d24492242ba9ea26c6b83163aa81464c8cfd.tar.gz RoughlyEnoughItems-6345d24492242ba9ea26c6b83163aa81464c8cfd.tar.bz2 RoughlyEnoughItems-6345d24492242ba9ea26c6b83163aa81464c8cfd.zip | |
Merge branch '1.14-dev' into 1.14
Diffstat (limited to 'src/main/resources')
| -rwxr-xr-x | src/main/resources/assets/roughlyenoughitems/lang/en_us.json | 5 | ||||
| -rwxr-xr-x | src/main/resources/fabric.mod.json | 2 | ||||
| -rwxr-xr-x | src/main/resources/roughlyenoughitems.mixins.json | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json index 8ca9f3bac..20b83be95 100755 --- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json +++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json @@ -7,6 +7,11 @@ "text.rei.config.action": "Action", "text.rei.config.cheating": "Cheating:", "text.rei.cheating": "Cheating", + "text.rei.cheating_disabled": "§7Cheating Disabled", + "text.rei.cheating_enabled": "§cCheating Enabled", + "text.rei.cheating_limited_enabled": "§bCheating Enabled (Using Commands)", + "text.rei.cheating_enabled_no_perms": "§7Cheating §cEnabled §7(No Permission)", + "text.rei.no_permission_cheat": "Operator permissions are required to cheat items", "category.rei.crafting": "Crafting", "category.rei.smelting": "Smelting", "category.rei.smelting.fuel": "§eFuel", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2513c7fdf..df2c2d1bb 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -14,7 +14,6 @@ }, "license": "MIT", "icon": "pack.png", - "environment": "client", "entrypoints": { "client": [ "me.shedaniel.rei.RoughlyEnoughItemsCore", @@ -33,7 +32,6 @@ }, "requires": { "fabricloader": ">=0.4.0", - "fabric": "^0.2.6", "cloth": "*" }, "recommends": { diff --git a/src/main/resources/roughlyenoughitems.mixins.json b/src/main/resources/roughlyenoughitems.mixins.json index f43977162..0fcdc8327 100755 --- a/src/main/resources/roughlyenoughitems.mixins.json +++ b/src/main/resources/roughlyenoughitems.mixins.json @@ -3,16 +3,12 @@ "package": "me.shedaniel.rei.mixin", "minVersion": "0.7.11", "compatibilityLevel": "JAVA_8", - "mixins": [ - "MixinPlayerManager" - ], + "mixins": [], "client": [ "MixinContainerScreen", "MixinBrewingRecipeRegistry", "MixinRecipeBookGui", - "MixinCreativePlayerInventoryScreen", - "MixinClientPlayNetworkHandler", - "MixinClientConnection" + "MixinCreativePlayerInventoryScreen" ], "injectors": { "defaultRequire": 1 |