Update to 1.15

Squashed commit of the following: commit a65cc16 Author: Brottweiler <[email protected]> Date: Sat Feb 8 20:34:19 2020 +0100 Fix fire commit 6db875d Author: Brottweiler <[email protected]> Date: Mon Jan 27 18:59:13 2020 +0100 Improve enchantment glint commit 628fbfa Author: Brottweiler <[email protected]> Date: Mon Jan 27 18:41:18 2020 +0100 Update strings commit 9c047fa Author: Brottweiler <[email protected]> Date: Sun Jan 26 18:28:03 2020 +0100 Fix iron golem commit 72fc692 Merge: 9015314 f4baf6f Author: Brottweiler <[email protected]> Date: Sat Jan 25 19:50:17 2020 +0100 Merge branch 'master' of github.com:Plastix/Plast-Pack into 1.15 commit 9015314 Author: Brottweiler <[email protected]> Date: Fri Dec 27 17:36:59 2019 +0100 Remove duplicate HD font commit ab17d45 Author: Brottweiler <[email protected]> Date: Sun Dec 15 21:15:19 2019 +0100 Update optifine strings commit 561b9cd Author: Brottweiler <[email protected]> Date: Fri Dec 13 22:40:55 2019 +0100 Tweak strings commit 7687c24 Author: Brottweiler <[email protected]> Date: Fri Dec 13 22:22:09 2019 +0100 Update changelog commit c0f46eb Author: Brottweiler <[email protected]> Date: Fri Dec 13 22:21:34 2019 +0100 Update strings commit 0d498ac Author: Brottweiler <[email protected]> Date: Tue Dec 10 19:01:00 2019 +0100 Update chests commit cc08940 Author: Brottweiler <[email protected]> Date: Tue Dec 10 17:40:25 2019 +0100 Bump version
Plastix · Jun 4, 2020 · dd60b4c · dd60b4c
1 parent f4baf6f
commit dd60b4c
Show file tree

Hide file tree

Showing 16 changed files with 80 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 Plast Pack Changelog
 ======
-V1.17.1
+V1.18
 ------
+    - Updated to 1.15
     - Tweaked hotbar cooldown indicator to look like oc.tc sword
 
 V1.17

diff --git a/assets/minecraft/lang/en_oc.json b/assets/minecraft/lang/en_oc.json
diff --git a/assets/minecraft/optifine/lang/en_oc.lang b/assets/minecraft/optifine/lang/en_oc.lang
@@ -56,8 +56,10 @@ of.options.skinCustomisation.ofCape=§bOptiFine Cape
 of.options.capeOF.title=OptiFine Cape
 of.options.capeOF.openEditor=§bOpen Cape Editor
 of.options.capeOF.reloadCape=§bReload Cape
+of.options.capeOF.copyEditorLink=§bCopy Link To Clipboard
 
 of.message.capeOF.openEditor=The OptiFine cape editor should open in a web browser.
+of.message.capeOF.openEditorError=Error opening the editor link in a web browser.
 of.message.capeOF.reloadCape=The cape will be reloaded in 15 seconds.
 
 of.message.capeOF.error1=Mojang authentication failed.

diff --git a/...minecraft/textures/block/fire_layer_0.png → assets/minecraft/textures/block/fire_0.png b/...minecraft/textures/block/fire_layer_0.png → assets/minecraft/textures/block/fire_0.png
diff --git a/...ft/textures/block/fire_layer_0.png.mcmeta → ...inecraft/textures/block/fire_0.png.mcmeta b/...ft/textures/block/fire_layer_0.png.mcmeta → ...inecraft/textures/block/fire_0.png.mcmeta
diff --git a/...minecraft/textures/block/fire_layer_1.png → assets/minecraft/textures/block/fire_1.png b/...minecraft/textures/block/fire_layer_1.png → assets/minecraft/textures/block/fire_1.png
diff --git a/...ft/textures/block/fire_layer_1.png.mcmeta → ...inecraft/textures/block/fire_1.png.mcmeta b/...ft/textures/block/fire_layer_1.png.mcmeta → ...inecraft/textures/block/fire_1.png.mcmeta
diff --git a/assets/minecraft/textures/entity/chest/ender.png b/assets/minecraft/textures/entity/chest/ender.png
diff --git a/assets/minecraft/textures/entity/chest/trapped.png b/assets/minecraft/textures/entity/chest/trapped.png
diff --git a/assets/minecraft/textures/entity/chest/trapped_double.png b/assets/minecraft/textures/entity/chest/trapped_double.png
diff --git a/assets/minecraft/textures/entity/chest/trapped_left.png b/assets/minecraft/textures/entity/chest/trapped_left.png
diff --git a/assets/minecraft/textures/entity/chest/trapped_right.png b/assets/minecraft/textures/entity/chest/trapped_right.png
diff --git a/.../minecraft/textures/entity/iron_golem.png → ...textures/entity/iron_golem/iron_golem.png b/.../minecraft/textures/entity/iron_golem.png → ...textures/entity/iron_golem/iron_golem.png
diff --git a/assets/minecraft/textures/font/HD font/ascii.png b/assets/minecraft/textures/font/HD font/ascii.png
diff --git a/assets/minecraft/textures/misc/enchanted_item_glint.png b/assets/minecraft/textures/misc/enchanted_item_glint.png
diff --git a/pack.mcmeta b/pack.mcmeta
@@ -1,7 +1,7 @@
 {
   "pack": {
-    "pack_format": 4,
-    "description": "\u00A7ev1.17 \u00A7bfor Minecraft \u00A7c1.14.x\n\u00A7bby \u00A7aPlastix"
+    "pack_format": 5,
+    "description": "\u00A7ev1.18 \u00A7bfor Minecraft \u00A7c1.15.x\n\u00A7bby \u00A7aPlastix"
   },
   "language": {
       "en_oc": {