Skip to content

Commit

Permalink
Update to 1.14
Browse files Browse the repository at this point in the history
  • Loading branch information
Brottweiler committed Aug 5, 2019
1 parent e53a640 commit 4ad45db
Show file tree
Hide file tree
Showing 188 changed files with 465 additions and 63 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Plast Pack Changelog
======
V1.17
----
- Updated to 1.14
- Skinny crossbow with drawback status bar!

V1.16.2
-------
- Updated to 1.13.2
Expand Down
424 changes: 381 additions & 43 deletions assets/minecraft/lang/en_oc.json

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion assets/minecraft/optifine/color.properties
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
lilypad=6aef3f
lilypad=6aef3f

screen.loading=222222
screen.loading.bar=111111
screen.loading.progress=f6883e
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ method=horizontal
tiles=0-3
connect=block
faces=sides
matchBlocks=minecraft:bookshelf

Bookshelves
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
method=random
tiles=0-11
symmetry=all
matchBlocks=minecraft:brewing_stand
matchTiles=minecraft:brewing_stand

Brewing Stand
3 changes: 2 additions & 1 deletion assets/minecraft/optifine/ctm/brick/bricks.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ method=random
tiles=0-6
weights=10 2 2 2 2 2 2
sides=all
matchBlocks=minecraft:bricks

Brick
Brick
1 change: 1 addition & 0 deletions assets/minecraft/optifine/ctm/flowers/dandelion.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
method=random
tiles=0-1
symmetry=all
matchBlocks=minecraft:dandelion

Yellow Flower
1 change: 1 addition & 0 deletions assets/minecraft/optifine/ctm/flowers/poppy.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
method=random
tiles=2-3
symmetry=all
matchBlocks=minecraft:poppy

Red Rose
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ method=overlay_random
faces=top
tiles=0-3 <skip>
weights=1 1 1 1 55
matchBlocks=minecraft:grass_block
3 changes: 2 additions & 1 deletion assets/minecraft/optifine/ctm/ironbars/iron_bars.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
method=vertical
tiles=0-3
matchBlocks=minecraft:iron_bars

Iron Bars
Iron Bars
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
method=random
tiles=0-3
matchBlocks=minecraft:red_mushroom_block

Red Mushroom Block
3 changes: 2 additions & 1 deletion assets/minecraft/optifine/ctm/reeds/sugar_cane.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
method=vertical
tiles=0-3
matchBlocks=sugar_cane

Sugar Cane
Sugar Cane
1 change: 1 addition & 0 deletions assets/minecraft/optifine/ctm/tallgrass/grass.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
method=random
tiles=0-4
symmetry=all
matchBlocks=grass

Tall Grass
3 changes: 2 additions & 1 deletion assets/minecraft/optifine/ctm/vines/vine.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
method=vertical
tiles=0-3
matchBlocks=vine

Vines
Vines
71 changes: 57 additions & 14 deletions assets/minecraft/optifine/lang/en_oc.lang
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# General
of.general.ambiguous=ambiguous
of.general.compact=Compact
of.general.custom=Custom
of.general.from=From
of.general.id=Id
of.general.max=Maximum
of.general.restart=restart
of.general.smart=§dSmart

Expand Down Expand Up @@ -51,6 +53,16 @@ of.message.loadingVisibleChunks=Loading visible chunks

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.message.capeOF.openEditor=The OptiFine cape editor should open in a web browser.
of.message.capeOF.reloadCape=The cape will be reloaded in 15 seconds.

of.message.capeOF.error1=Mojang authentication failed.
of.message.capeOF.error2=Error: %s

# Video settings

options.graphics.tooltip.1=Visual quality
Expand Down Expand Up @@ -105,6 +117,7 @@ options.guiScale.tooltip.4= 4x to 10x - available on 4K displays
options.guiScale.tooltip.5=Odd values (1x, 3x, 5x ...) are not compatible with Unicode.
options.guiScale.tooltip.6=A smaller GUI may be faster.

options.vbo=§bUse VBOs
options.vbo.tooltip.1=Vertex Buffer Objects
options.vbo.tooltip.2=Uses an alternative rendering model which is usually
options.vbo.tooltip.3=faster (5-10%%) than the default rendering.
Expand All @@ -121,6 +134,13 @@ options.anaglyph.tooltip.2=Enables a stereoscopic 3D effect using different colo
options.anaglyph.tooltip.3=for each eye.
options.anaglyph.tooltip.4=Requires red-cyan glasses for proper viewing.

options.attackIndicator.tooltip.1=Configures the position of the attack indicator
options.attackIndicator.tooltip.2= Crosshair - under the crosshair
options.attackIndicator.tooltip.3= Hotbar - next to the hotbar
options.attackIndicator.tooltip.4= OFF - no attack indicator
options.attackIndicator.tooltip.5=The attack indicator shows the attack power of the
options.attackIndicator.tooltip.6=currently equipped item

of.options.ALTERNATE_BLOCKS=§bAlternate Blocks
of.options.ALTERNATE_BLOCKS.tooltip.1=Alternate Blocks
of.options.ALTERNATE_BLOCKS.tooltip.2=Uses alternative block models for some blocks.
Expand Down Expand Up @@ -280,7 +300,7 @@ options.mipmapLevels.tooltip.1=Visual effect which makes distant objects look be
options.mipmapLevels.tooltip.2=by smoothing the texture details
options.mipmapLevels.tooltip.3= OFF - no smoothing
options.mipmapLevels.tooltip.4= 1 - minimum smoothing
options.mipmapLevels.tooltip.5= 4 - maximum smoothing
options.mipmapLevels.tooltip.5= Maximum - maximum smoothing
options.mipmapLevels.tooltip.6=This option usually does not affect the performance.

of.options.MIPMAP_TYPE=§bMipmap Type
Expand Down Expand Up @@ -533,6 +553,13 @@ of.options.DYNAMIC_LIGHTS.tooltip.5=Enables light emitting items (torch, glowsto
of.options.DYNAMIC_LIGHTS.tooltip.6=to illuminate everything around them when held in hand,
of.options.DYNAMIC_LIGHTS.tooltip.7=equipped by other player or dropped on the ground.

options.biomeBlendRadius.tooltip.1=Smooths the color transition between biomes
options.biomeBlendRadius.tooltip.2= OFF - no blending (fastest)
options.biomeBlendRadius.tooltip.3= 5x5 - normal blending (default)
options.biomeBlendRadius.tooltip.4= 15x15 - maximal blending (slowest)
options.biomeBlendRadius.tooltip.5=Higher values may generate significant lag spikes
options.biomeBlendRadius.tooltip.6=add slow down the chunk loading speed.

# Performance

of.options.SMOOTH_FPS=§bSmooth FPS
Expand Down Expand Up @@ -673,12 +700,12 @@ options.fullscreen.tooltip.3= OFF - use window mode
options.fullscreen.tooltip.4=Fullscreen mode may be faster or slower than
options.fullscreen.tooltip.5=window mode, depending on the graphics card.

of.options.FULLSCREEN_MODE=§bFullscreen Mode
of.options.FULLSCREEN_MODE.tooltip.1=Fullscreen mode
of.options.FULLSCREEN_MODE.tooltip.2= Default - use desktop screen resolution, slower
of.options.FULLSCREEN_MODE.tooltip.3= WxH - use custom screen resolution, may be faster
of.options.FULLSCREEN_MODE.tooltip.4=The selected resolution is used in fullscreen mode (F11).
of.options.FULLSCREEN_MODE.tooltip.5=Lower resolutions should generally be faster.
options.fullscreen.resolution=§bFullscreen Mode
options.fullscreen.resolution.tooltip.1=Fullscreen mode
options.fullscreen.resolution.tooltip.2= Default - use desktop screen resolution, slower
options.fullscreen.resolution.tooltip.3= WxH - use custom screen resolution, may be faster
options.fullscreen.resolution.tooltip.4=The selected resolution is used in fullscreen mode (F11).
options.fullscreen.resolution.tooltip.5=Lower resolutions should generally be faster.

of.options.SHOW_FPS=§bShow FPS
of.options.SHOW_FPS.tooltip.1=Shows compact FPS and render information.
Expand All @@ -689,15 +716,18 @@ of.options.SHOW_FPS.tooltip.5= U: - chunk updates
of.options.SHOW_FPS.tooltip.6=The compact FPS information is only shown when the
of.options.SHOW_FPS.tooltip.7=debug screen is not visible.

of.options.save.default=§cDefault (2s)
of.options.save.20s=§e20s
of.options.save.3min=§a3min
of.options.save.30min=§530min
of.options.save.45s=§445s
of.options.save.90s=§c90s
of.options.save.3min=§e3min
of.options.save.6min=§a6min
of.options.save.12min=§512min
of.options.save.24min=§524min

of.options.AUTOSAVE_TICKS=§bAutosave
of.options.AUTOSAVE_TICKS.tooltip.1=Autosave interval
of.options.AUTOSAVE_TICKS.tooltip.2=Default autosave interval (2s) is NOT RECOMMENDED.
of.options.AUTOSAVE_TICKS.tooltip.3=Autosave causes the famous Lag Spike of Death.
of.options.AUTOSAVE_TICKS.tooltip.1=Autosave Interval
of.options.AUTOSAVE_TICKS.tooltip.2= 45s - default
of.options.AUTOSAVE_TICKS.tooltip.3=Autosave may generate lag spikes depending on the render distance.
of.options.AUTOSAVE_TICKS.tooltip.4=The world is also saved when the game menu is opened.

of.options.SCREENSHOT_SIZE=§bScreenshot Size
of.options.SCREENSHOT_SIZE.tooltip.1=Screenshot Size
Expand All @@ -714,3 +744,16 @@ of.options.SHOW_GL_ERRORS.tooltip.3=Disable it only if there is a known conflict
of.options.SHOW_GL_ERRORS.tooltip.4=the errors can't be fixed.
of.options.SHOW_GL_ERRORS.tooltip.5=When disabled the errors are still logged in the
of.options.SHOW_GL_ERRORS.tooltip.6=error log and they may still cause a significant FPS drop.

# Chat Settings

of.options.CHAT_BACKGROUND=§bChat Background
of.options.CHAT_BACKGROUND.tooltip.1=Chat Background
of.options.CHAT_BACKGROUND.tooltip.2= Default - fixed width
of.options.CHAT_BACKGROUND.tooltip.3= Compact - matches line width
of.options.CHAT_BACKGROUND.tooltip.4= OFF - hidden

of.options.CHAT_SHADOW=§bChat Shadow
of.options.CHAT_SHADOW.tooltip.1=Chat Shadow
of.options.CHAT_SHADOW.tooltip.2= ON - use text shadow
of.options.CHAT_SHADOW.tooltip.3= OFF - no text shadow
Binary file added assets/minecraft/textures/block/barrel_bottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/minecraft/textures/block/barrel_side.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/minecraft/textures/block/cornflower.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/minecraft/textures/block/iron_block.png
Binary file not shown.
Binary file added assets/minecraft/textures/block/lantern.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/minecraft/textures/block/lectern_base.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/minecraft/textures/block/lectern_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/minecraft/textures/entity/illager/evoker.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added assets/minecraft/textures/entity/signs/acacia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/minecraft/textures/entity/signs/birch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/minecraft/textures/entity/signs/jungle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added assets/minecraft/textures/entity/signs/spruce.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file removed assets/minecraft/textures/entity/villager/farmer.png
Binary file not shown.
Binary file not shown.
Binary file removed assets/minecraft/textures/entity/villager/priest.png
Binary file not shown.
Binary file removed assets/minecraft/textures/entity/villager/smith.png
Binary file not shown.
Binary file not shown.
Binary file removed assets/minecraft/textures/entity/witch.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file added assets/minecraft/textures/gui/accessibility.png
Binary file modified assets/minecraft/textures/gui/container/inventory.png
Binary file added assets/minecraft/textures/gui/container/loom.png
Diff not rendered.
Binary file modified assets/minecraft/textures/gui/recipe_book.png
Binary file added assets/minecraft/textures/item/black_dye.png
Binary file added assets/minecraft/textures/item/blue_dye.png
Binary file added assets/minecraft/textures/item/brown_dye.png
Binary file added assets/minecraft/textures/item/crossbow_arrow.png
Binary file added assets/minecraft/textures/item/white_dye.png
Binary file added assets/minecraft/textures/mob_effect/glowing.png
Binary file added assets/minecraft/textures/mob_effect/haste.png
Binary file added assets/minecraft/textures/mob_effect/hunger.png
Binary file added assets/minecraft/textures/mob_effect/nausea.png
Binary file added assets/minecraft/textures/mob_effect/poison.png
Binary file added assets/minecraft/textures/mob_effect/slowness.png
Binary file added assets/minecraft/textures/mob_effect/speed.png
Binary file added assets/minecraft/textures/mob_effect/strength.png
Binary file added assets/minecraft/textures/mob_effect/wither.png
Binary file added assets/minecraft/textures/painting/alban.png
Binary file added assets/minecraft/textures/painting/aztec.png
Binary file added assets/minecraft/textures/painting/aztec2.png
Binary file added assets/minecraft/textures/painting/back.png
Binary file added assets/minecraft/textures/painting/bomb.png
Binary file added assets/minecraft/textures/painting/bust.png
Binary file added assets/minecraft/textures/painting/courbet.png
Binary file added assets/minecraft/textures/painting/creebet.png
Binary file added assets/minecraft/textures/painting/fighters.png
Binary file added assets/minecraft/textures/painting/graham.png
Binary file added assets/minecraft/textures/painting/kebab.png
Binary file added assets/minecraft/textures/painting/match.png
Diff not rendered.
Binary file added assets/minecraft/textures/painting/pigscene.png
Binary file added assets/minecraft/textures/painting/plant.png
Binary file added assets/minecraft/textures/painting/pointer.png
Binary file added assets/minecraft/textures/painting/pool.png
Binary file added assets/minecraft/textures/painting/sea.png
Binary file added assets/minecraft/textures/painting/skeleton.png
Binary file added assets/minecraft/textures/painting/stage.png
Binary file added assets/minecraft/textures/painting/sunset.png
Binary file added assets/minecraft/textures/painting/void.png
Binary file added assets/minecraft/textures/painting/wanderer.png
Binary file added assets/minecraft/textures/painting/wasteland.png
Binary file added assets/minecraft/textures/painting/wither.png
Binary file added assets/minecraft/textures/particle/angry.png
Binary file added assets/minecraft/textures/particle/bubble.png
Binary file added assets/minecraft/textures/particle/damage.png
Binary file added assets/minecraft/textures/particle/flame.png
Binary file added assets/minecraft/textures/particle/generic_0.png
Binary file added assets/minecraft/textures/particle/generic_1.png
Binary file added assets/minecraft/textures/particle/generic_2.png
Binary file added assets/minecraft/textures/particle/generic_3.png
Binary file added assets/minecraft/textures/particle/generic_4.png
Binary file added assets/minecraft/textures/particle/generic_5.png
Binary file added assets/minecraft/textures/particle/generic_6.png
Binary file added assets/minecraft/textures/particle/generic_7.png
Binary file added assets/minecraft/textures/particle/glint.png
Binary file added assets/minecraft/textures/particle/heart.png
Binary file added assets/minecraft/textures/particle/lava.png
Binary file removed assets/minecraft/textures/particle/particles.png
Diff not rendered.
Binary file added assets/minecraft/textures/particle/sga_a.png
Binary file added assets/minecraft/textures/particle/sga_b.png
Binary file added assets/minecraft/textures/particle/sga_c.png
Binary file added assets/minecraft/textures/particle/sga_d.png
Binary file added assets/minecraft/textures/particle/sga_e.png
Binary file added assets/minecraft/textures/particle/sga_f.png
Binary file added assets/minecraft/textures/particle/sga_g.png
Binary file added assets/minecraft/textures/particle/sga_h.png
Binary file added assets/minecraft/textures/particle/sga_i.png
Binary file added assets/minecraft/textures/particle/sga_j.png
Binary file added assets/minecraft/textures/particle/sga_k.png
Binary file added assets/minecraft/textures/particle/sga_l.png
Binary file added assets/minecraft/textures/particle/sga_m.png
Binary file added assets/minecraft/textures/particle/sga_n.png
Binary file added assets/minecraft/textures/particle/sga_o.png
Binary file added assets/minecraft/textures/particle/sga_p.png
Binary file added assets/minecraft/textures/particle/sga_q.png
Binary file added assets/minecraft/textures/particle/sga_r.png
Binary file added assets/minecraft/textures/particle/sga_s.png
Binary file added assets/minecraft/textures/particle/sga_t.png
Binary file added assets/minecraft/textures/particle/sga_u.png
Binary file added assets/minecraft/textures/particle/sga_v.png
Binary file added assets/minecraft/textures/particle/sga_w.png
Binary file added assets/minecraft/textures/particle/sga_x.png
Binary file added assets/minecraft/textures/particle/sga_y.png
Binary file added assets/minecraft/textures/particle/sga_z.png
Binary file added assets/minecraft/textures/particle/splash_0.png
Binary file added assets/minecraft/textures/particle/splash_1.png
Binary file added assets/minecraft/textures/particle/splash_2.png
Binary file added assets/minecraft/textures/particle/splash_3.png
2 changes: 1 addition & 1 deletion pack.mcmeta
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"pack": {
"pack_format": 4,
"description": "\u00A7ev1.16.2 \u00A7bfor Minecraft \u00A7c1.13.x\n\u00A7bby \u00A7aPlastix"
"description": "\u00A7ev1.17 \u00A7bfor Minecraft \u00A7c1.14.x\n\u00A7bby \u00A7aPlastix"
},
"language": {
"en_oc": {
Expand Down

0 comments on commit 4ad45db

Please sign in to comment.