Merge branch 'master' into no-sounds

assets/minecraft/blockstates/acacia_log.json

@@ -1,17 +1,16 @@
 {
     "variants": {
         "axis=y": [
-			{ "model": "block/acacia_log" },
+            { "model": "block/acacia_log" },
-			{ "model": "block/logs/acacia/1" }
+            { "model": "block/logs/acacia/1" }
-		],
+        ],
         "axis=z": [
-			{ "model": "block/acacia_log", "x": 90 },
+            { "model": "block/acacia_log", "x": 90 },
-			{ "model": "block/logs/acacia/1", "x": 90 }
+            { "model": "block/logs/acacia/1", "x": 90 }
-		],
+        ],
         "axis=x": [
-			{ "model": "block/acacia_log", "x": 90, "y": 90 },
+            { "model": "block/acacia_log", "x": 90, "y": 90 },
-			{ "model": "block/logs/acacia/1", "x": 90, "y": 90 }
+            { "model": "block/logs/acacia/1", "x": 90, "y": 90 }
-		],
+        ]
-        "axis=none": { "model": "block/acacia_log" }
     }
 }

assets/minecraft/blockstates/birch_log.json

@@ -1,17 +1,16 @@
 {
     "variants": {
         "axis=y": [
-			{ "model": "block/birch_log" },
+            { "model": "block/birch_log" },
-			{ "model": "block/logs/birch/1" }
+            { "model": "block/logs/birch/1" }
-		],
+        ],
         "axis=z": [
-			{ "model": "block/birch_log", "x": 90 },
+            { "model": "block/birch_log", "x": 90 },
-			{ "model": "block/logs/birch/1", "x": 90 }
+            { "model": "block/logs/birch/1", "x": 90 }
-		],
+        ],
         "axis=x": [
-			{ "model": "block/birch_log", "x": 90, "y": 90 },
+            { "model": "block/birch_log", "x": 90, "y": 90 },
-			{ "model": "block/logs/birch/1", "x": 90, "y": 90 }
+            { "model": "block/logs/birch/1", "x": 90, "y": 90 }
-		],
+        ]
-        "axis=none": { "model": "block/birch_log" }
     }
 }

assets/minecraft/blockstates/dark_oak_log.json

@@ -1,17 +1,16 @@
 {
     "variants": {
         "axis=y": [
-			{ "model": "block/dark_oak_log" },
+            { "model": "block/dark_oak_log" },
-			{ "model": "block/logs/dark_oak/1" }
+            { "model": "block/logs/dark_oak/1" }
-		],
+        ],
         "axis=z": [
-			{ "model": "block/dark_oak_log", "x": 90 },
+            { "model": "block/dark_oak_log", "x": 90 },
-			{ "model": "block/logs/dark_oak/1", "x": 90 }
+            { "model": "block/logs/dark_oak/1", "x": 90 }
-		],
+        ],
         "axis=x": [
-			{ "model": "block/dark_oak_log", "x": 90, "y": 90 },
+            { "model": "block/dark_oak_log", "x": 90, "y": 90 },
-			{ "model": "block/logs/dark_oak/1", "x": 90, "y": 90 }
+            { "model": "block/logs/dark_oak/1", "x": 90, "y": 90 }
-		],
+        ]
-        "axis=none": { "model": "block/dark_oak_log" }
     }
 }

assets/minecraft/blockstates/jungle_log.json

@@ -1,17 +1,16 @@
 {
     "variants": {
         "axis=y": [
-			{ "model": "block/jungle_log" },
+            { "model": "block/jungle_log" },
-			{ "model": "block/logs/jungle/1" }
+            { "model": "block/logs/jungle/1" }
-		],
+        ],
         "axis=z": [
-			{ "model": "block/jungle_log", "x": 90 },
+            { "model": "block/jungle_log", "x": 90 },
-			{ "model": "block/logs/jungle/1", "x": 90 }
+            { "model": "block/logs/jungle/1", "x": 90 }
-		],
+        ],
         "axis=x": [
-			{ "model": "block/jungle_log", "x": 90, "y": 90 },
+            { "model": "block/jungle_log", "x": 90, "y": 90 },
-			{ "model": "block/logs/jungle/1", "x": 90, "y": 90 }
+            { "model": "block/logs/jungle/1", "x": 90, "y": 90 }
-		],
+        ]
-        "axis=none": { "model": "block/jungle_log" }
     }
 }

assets/minecraft/blockstates/oak_log.json

@@ -1,17 +1,16 @@
 {
     "variants": {
         "axis=y": [
-			{ "model": "block/oak_log" },
+            { "model": "block/oak_log" },
-			{ "model": "block/logs/oak/1" }
+            { "model": "block/logs/oak/1" }
-		],
+        ],
         "axis=z": [
-			{ "model": "block/oak_log", "x": 90 },
+            { "model": "block/oak_log", "x": 90 },
-			{ "model": "block/logs/oak/1", "x": 90 }
+            { "model": "block/logs/oak/1", "x": 90 }
-		],
+        ],
         "axis=x": [
-			{ "model": "block/oak_log", "x": 90, "y": 90 },
+            { "model": "block/oak_log", "x": 90, "y": 90 },
-			{ "model": "block/logs/oak/1", "x": 90, "y": 90 }
+            { "model": "block/logs/oak/1", "x": 90, "y": 90 }
-		],
+        ]
-        "axis=none": { "model": "block/oak_log" }
     }
 }

assets/minecraft/blockstates/spruce_log.json

@@ -1,17 +1,16 @@
 {
     "variants": {
         "axis=y": [
-			{ "model": "block/spruce_log" },
+            { "model": "block/spruce_log" },
-			{ "model": "block/logs/spruce/1" }
+            { "model": "block/logs/spruce/1" }
-		],
+        ],
         "axis=z": [
-			{ "model": "block/spruce_log", "x": 90 },
+            { "model": "block/spruce_log", "x": 90 },
-			{ "model": "block/logs/spruce/1", "x": 90 }
+            { "model": "block/logs/spruce/1", "x": 90 }
-		],
+        ],
         "axis=x": [
-			{ "model": "block/spruce_log", "x": 90, "y": 90 },
+            { "model": "block/spruce_log", "x": 90, "y": 90 },
-			{ "model": "block/logs/spruce/1", "x": 90, "y": 90 }
+            { "model": "block/logs/spruce/1", "x": 90, "y": 90 }
-		],
+        ]
-        "axis=none": { "model": "block/spruce_log" }
     }
 }

assets/minecraft/optifine/color.properties

@@ -1,24 +1,28 @@
 ###############################################################################
+# Sample configuration for OptiFine's Custom Colors feature.
+# Based on the configuration for MCPatcher's Custom Colors mod.
+#
+###############################################################################
 # color.properties
 ###############################################################################
-# Sample color.properties file for use with MCPatcher's Custom Colors mod.
-#
-# This file is offered without any copyright restrictions. Please copy and
-# modify it to suit your needs.  Then place it at /color.properties in your
-# texture pack.
 #
 # You only need to provide values for the properties you wish to change.  The
 # default Minecraft values for each property are given below for convenience.
 #
-# Property names are case-sensitive.
+# All property names are case-sensitive.
 # All colors are in hex rgb format, 000000 to ffffff.
+# All paths are relative to assets/minecraft unless otherwise stated.
 ###############################################################################
 
 ###############################################################################
 # Base color of particle effects
 ###############################################################################
+# Base water particle (splashes, bubbles, drops) color.  Biome water color
+# multiplier is applied to this value.  The value should match the color of
+# your base water texture.  If your base water texture is grey so that you do
+# coloring via misc/watercolorX.png, you should set this to ffffff.
 particle.portal=C15320
-drop.water=30587F
+particle.water=30587F
 
 ###############################################################################
 # Nether and End colors
@@ -61,6 +65,12 @@ potion.water=385dc6
 
 ###############################################################################
 # Spawner egg colors
+# egg.<shell|spots>.<entity>=<color>
+# The entity name can be given in short or in full form.
+# The separator ":" in the full form has to be escaped.
+# For example:
+#   egg.shell.creeper=0da70b
+#   egg.spots.minecraft\:creeper=000000
 ###############################################################################
 
 
@@ -116,31 +126,44 @@ text.sign=000000
 # Complete file list
 ###############################################################################
 # Below is a full list of files used by the Custom Colors mod:
-# /color.properties - this file
+# NOTE: ~ is shorthand for the optifine folder (assets/minecraft/optifine)
-# /misc/redstonecolor.png - 16x1 redstone colors (0=fully off, 15=fully on)
+# ~/color.properties - this file
-# /misc/stemcolor.png - 8x1 pumpkin/melon stem colors (0=sprout, 7=fully grown)
+# ~/colormap/redstone.png - 16x1 redstone colors (0=fully off, 15=fully on)
-# /misc/lavadropcolor.png - Nx1 lava drop colors (x=age of particle in ticks)
+# ~/colormap/pumpkinstem.png - 8x1 pumpkin stem colors (0=sprout, 7=fully grown)
-# /misc/swampgrasscolor.png - 256x256 swamp grass color palette
+# ~/colormap/melonstem.png - 8x1 melon stem colors (0=sprout, 7=fully grown)
-# /misc/swampfoliagecolor.png - 256x256 swamp foliage color palette
+# ~/colormap/lavadrop.png - Nx1 lava drop colors (x=age of particle in ticks)
-# /misc/pinecolor.png - 256x256 pine tree color palette
+# ~/colormap/myceliumparticle.png - any size, random mycelium particle colors
-# /misc/birchcolor.png - 256x256 birch tree color palette
+# ~/colormap/xporb.png - any size, array of xp orb colors
-# /misc/watercolorX.png - 256x256 water color palette
+# ~/colormap/durability.png - any size, array of item durability colors
-# /misc/underwatercolor.png - 256x256 underwater color
+#
-# /misc/fogcolor0.png - 256x256 fog color for the overworld
+# ~/colormap/swampgrass.png - 256x256 swamp grass color palette
-# /misc/skycolor0.png - 256x256 sky color for the overworld
+# ~/colormap/swampfoliage.png - 256x256 swamp foliage color palette
-# /environment/lightmap0.png - Nx32 overworld lighting palettes
+# ~/colormap/pine.png - 256x256 pine tree color palette
-# /environment/lightmap-1.png - Nx32 Nether lighting palettes
+# ~/colormap/birch.png - 256x256 birch tree color palette
-# /environment/lightmap1.png - Nx32 End lighting palettes
+# ~/colormap/water.png - 256x256 water color palette
+# ~/colormap/underwater.png - 256x256 underwater color
+# ~/colormap/underlava.png - 256x256 underlava color
+# ~/colormap/fog0.png - 256x256 fog color for the overworld
+# ~/colormap/sky0.png - 256x256 sky color for the overworld
+#
+# ~/lightmap/world0.png - Nx32 or Nx64 overworld lighting palettes
+# ~/lightmap/world-1.png - Nx32 or Nx64 Nether lighting palettes
+# ~/lightmap/world1.png - Nx32 or Nx64 End lighting palettes
 
 ###############################################################################
 # Custom biome palettes
 ###############################################################################
 # You may assign custom biome palettes to any standard block (i.e. one that
-# does not already have its own special color multiplier method).  The syntax
+# does not already have its own special color multiplier method).  Each custom
-# for this in color.properties is
+# colormap should have a properties file in ~/colormap/custom.  See
-#   palette.block.<image in texture pack>=<list of block IDs>
+# colormap.properties for more details.
-# The image must exist in your texture pack and must be 256x256.  For example,
+#
-# to color all stone and ore blocks with /misc/stonecolor.png
+# Default custom colormap format:
-#   palette.block./misc/stonecolor.png=1 14 15 16 21 56 73 74
+# Mojang-style temperature+humidity maps:
-# Block ID + metadata is also supported using the following syntax:
+#   palette.format=vanilla
-#   palette.block./misc/sandstone.png=24 43:1 44:1
+# OptiFine-style grid (x=biome ID, y=height) maps:
+#   palette.format=grid
+# Note that this setting does not affect the vanilla foliage and grass
+# colormaps in assets/minecraft/textures/colormap.  It can also be overridden
+# per-colormap in each individual properties file in ~/colormap/custom
+

assets/minecraft/optifine/colormap/blocks/reeds.properties

@@ -1 +0,0 @@
-format=fixed

assets/minecraft/optifine/colormap/blocks/sugar_cane.properties

@@ -0,0 +1,2 @@
+format=fixed
+blocks=sugar_cane

assets/minecraft/optifine/natural.properties

@@ -1,181 +1,120 @@
-# Template configuration for OptiFine's Natural Textures
+# Configuration for OptiFine's Natural Textures feature
-#
+# Location: /assets/minecraft/optifine/natural.properties
-# Rename this file to "natural.properties" to activate the configuration.
 #
 # Configuration format
-# <texture_file>:<tile_num>=<value>
+# <texture_name> = <value>
 #
 # Values
-# 4 = Rotate x 90° (4 variations)
+# 4 = Rotate x 90° (4 variants)
-# 2 = Rotate x 180° (2 variations)
+# 2 = Rotate x 180° (2 variants)
-# F = Flip texture horizontally (2 variations)
+# F = Flip texture horizontally (2 variants)
-# 4F = 4 + Flip (8 variations)
+# 4F = 4 + Flip (8 variants)
-# 2F = 2 + Flip (4 variations)
+# 2F = 2 + Flip (4 variants)
 #
-# Example for grass texture which can rotate with 4 variations and flip
+# Example for obsidian texture which can rotate with 4 variants and flip
-# /terrain.png:0=4F
+# obsidian = 4F
 #
 
 # Grass
-grass_top=4F
+grass_block_top = 4F
-# Stone
+grass_block_top1 = 4F
-stone=2
+grass_block_top2 = 4F
-# Dirt
+grass_block_top3 = 4F
-#dirt=F
+# Grass extras (flowers)
-# Grass side
+grass_block_top_extra = 4F
-#grass_side=F
+grass_block_top_extra1 = 4F
-#grass_side_overlay=F
+# grass_block_side = F
-# Slab
+# grass_block_side_overlay = F
-stoneslab_top=F
+grass_block_snow = F
-# Bedrock
+mycelium_side = F
-bedrock=2F
+mycelium_top = 4F
-# Sand
+grass_path_top = 4
-#sand=2
+grass_path_side = F
-# Gravel
-gravel=4
-# log sides
-log_oak=F
-log_spruce=F
-log_birch=F
-log_jungle=F
-# Wood top
-log_oak_top=4F
-
-log_jungle_top=4F
-
-log_birch_top=4F
-
-log_spruce_top=4F
-# Ores (gold, iron, coal, diamond, redstone, lapis)
-gold_ore=F
-iron_ore=F
-coal_ore=F
-diamond_ore=F
-redstone_ore=F
-lapis_ore=F
-emerald_ore=F
-quartz_ore=F
-# Obsidian
-#obsidian=4F
-# Leaves 
-leaves_oak=F
-leaves_oak_opaque=F
-# Jungle leaves
-leaves_jungle=2
-leaves_jungle_opaque=2
 # Snow
-snow=2F
+snow = 4F
-# Snow grass side
+# Dirt
-snow_side=F
+coarse_dirt = 4F
-# Cactus side
+podzol_top = 4F
-#cactus_side=F
+# podzol_side = F
-# Clay
+farmland = 2F
-clay=F
+farmland_moist = 2F
-# Mycelium side
+# Stone
-mycelium_side=F
+granite = 2F
-# Mycelium top
+granite1 = 2F
-mycelium_top=4F
+diorite = 2F
-# Farmland hydrated
+diorite1 = 2F
-farmland_wet=2F
+andesite = 2F
-# Farmland
+andesite1 = 2F
-farmland_dry=F
+sandstone_top = 4
-# Netherrack
+sandstone_bottom = 4F
-netherrack=4
+stone = 2
-# Soul sand
+stone1 = 2
-soul_sand=4F
+stone2 = 2
-# Glowstone
+stone3 = 2
-glowstone=4
+stone4 = 2
-# Pine leaves
+stone5 = 2
-#leaves_spruce=2F
+stone_slab_top = F
-#leaves_spruce_opaque=2F
+end_stone = 4
-# Endstone
+# Gravel
-#end_stone=F
+gravel = 4
-# Sandstone top
+clay = F
-sandstone_top=4
+# Logs
-# Sandstone bottom
+oak_log = F
-sandstone_bottom=4F
+oak_log1 = F
-# Redstone lamp
+spruce_log = F
-#redstone_lamp_off=4F
+spruce_log1 = F
-#redstone_lamp_on=4F
+birch_log = F
-#quartz_block_chiseled_top=4
+birch_log1 = F
-#hardened_clay=2
+jungle_log = F
-
+jungle_log1 = F
-#hardened_clay_stained_black=2
+acacia_log = F
-
+acacia_log1 = F
-#hardened_clay_stained_blue=2
+dark_oak_log = F
-
+oak_log_top = 4F
-#hardened_clay_stained_brown=2
+spruce_log_top = 4F
-
+birch_log_top = 4F
-#hardened_clay_stained_cyan=2
+jungle_log_top = 4F
-
+acacia_log_top = 4F
-#hardened_clay_stained_gray=2
+dark_oak_log_top = 4F
-#hardened_clay_stained_green=2
+# Leaves
-
+oak_leaves = 4F
-#hardened_clay_stained_light_blue=2
+oak_leaves1 = 4F
-
+spruce_leaves = 4F
-#hardened_clay_stained_lime=2
+spruce_leaves1 = 4F
-
+birch_leaves = 4F
-#hardened_clay_stained_magenta=2
+birch_leaves1 = 4F
-
+jungle_leaves = 4F
-#hardened_clay_stained_orange=2
+jungle_leaves1 = 4F
-
+dark_oak_leaves = 4F
-#hardened_clay_stained_pink=2
+dark_oak_leaves1 = 4F
-
+acacia_leaves = 4F
-#hardened_clay_stained_purple=2
+acacia_leaves1 = 4F
-
+# Ores
-#hardened_clay_stained_red=2
+gold_ore = F
-
+gold_ore1 = F
-#hardened_clay_stained_silver=2
+iron_ore = F
-
+iron_ore1 = F
-#hardened_clay_stained_white=2
+coal_ore = F
-
+coal_ore1 = F
-#hardened_clay_stained_yellow=2
+coal_ore2 = F
-
+diamond_ore = F
-hay_block_top=4
+diamond_ore1 = F
-
+emerald_ore = F
-cake_top=4F
+emerald_ore1 = F
-
+redstone_ore = F
-cake_side=F
+redstone_ore1 = F
-
+lapis_ore = F
-carrots_stage_0=F
+lapis_ore1 = F
-
+# Nether
-carrots_stage_1=F
+netherrack = 4
-
+nether_quartz_ore = 2
-carrots_stage_2=F
+soul_sand = 4F
-
+glowstone = 4
-carrots_stage_3=F
+# Redstone
-
+# redstone_lamp_on = 4F
-potatoes_stage_0=F
+# redstone_lamp = 4F
-
+# Prismarine
-potatoes_stage_1=F
+prismarine = 4F
-
+# Misc
-potatoes_stage_2=F
+obsidian = 2
-
+cactus_top = 4F
-potatoes_stage_3=F
-
-wheat_stage_7=F
-#lava_flow=4F
-
-#lava_still=4
-
-mushroom_block_inside=F
-
-mushroom_block_skin_brown=4F
-
-mushroom_block_skin_red=4F
-
-mushroom_block_skin_stem=F
-
-portal=4F
-
-redstone_dust_cross_overlay=4F
-
-redstone_dust_cross=4F
-
-redstone_dust_line_overlay=4F
-
-redstone_dust_line=4F
-
-#water_still=4F
-
-waterlily=4F