Merge pull request #1 from xisd/master

Fix for darkgrey paint and hide fences in creative inventory
master
Don 2016-10-04 11:12:08 -07:00 committed by GitHub
commit 0e12f1dd1c
6 changed files with 11 additions and 11 deletions

View File

@ -8,7 +8,7 @@ local mypaint_dirt_colors = {
{"brown", "Brown", "190B07"},
{"cyan", "Cyan", "00ffff"},
{"darkgreen", "Dark Green", "005000"},
{"darkgery", "Dark Grey", "1C1C1C"},
{"darkgrey", "Dark Grey", "1C1C1C"},
{"grey", "Grey", "848484"},
{"magenta", "Magenta", "ff00ff"},
{"orange", "Orange", "ff7700"},

View File

@ -8,7 +8,7 @@ local mypaint_fence_colors = {
{"brown", "Brown", "190B07"},
{"cyan", "Cyan", "00ffff"},
{"darkgreen", "Dark Green", "005000"},
{"darkgery", "Dark Grey", "1C1C1C"},
{"darkgrey", "Dark Grey", "1C1C1C"},
{"grey", "Grey", "848484"},
{"magenta", "Magenta", "ff00ff"},
{"orange", "Orange", "ff7700"},
@ -41,7 +41,7 @@ doors.register_fencegate(":doors:gate_wood_" .. color, {
description = desc .. " Wooden Fence Gate",
texture = "default_wood.png".. paint,
material = "default:fence_wood_" .. color,
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 0},
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(),
})
@ -57,7 +57,7 @@ doors.register_fencegate(":doors:gate_acacia_wood_" .. color, {
description = desc .. " Acacia Fence Gate",
texture = "default_acacia_wood.png".. paint,
material = "default:fence_acacia_wood_" .. color,
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 0},
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(),
})
@ -73,7 +73,7 @@ doors.register_fencegate(":doors:gate_junglewood_" .. color, {
description = desc .. " Junglewood Fence Gate",
texture = "default_junglewood.png".. paint,
material = "default:fence_junglewood_" .. color,
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 0},
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(),
})
@ -89,7 +89,7 @@ doors.register_fencegate(":doors:gate_aspen_wood_" .. color, {
description = desc .. " Aspen Fence Gate",
texture = "default_aspen_wood.png".. paint,
material = "default:fence_aspen_wood_" .. color,
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 0},
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(),
})
@ -105,7 +105,7 @@ doors.register_fencegate(":doors:gate_pine_wood_" .. color, {
description = desc .. " Pine Fence Gate",
texture = "default_pine_wood.png".. paint,
material = "default:fence_pine_wood_" .. color,
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 0},
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(),
})

View File

@ -8,7 +8,7 @@ local mypaint_gravel_colors = {
{"brown", "Brown", "190B07"},
{"cyan", "Cyan", "00ffff"},
{"darkgreen", "Dark Green", "005000"},
{"darkgery", "Dark Grey", "1C1C1C"},
{"darkgrey", "Dark Grey", "1C1C1C"},
{"grey", "Grey", "848484"},
{"magenta", "Magenta", "ff00ff"},
{"orange", "Orange", "ff7700"},

View File

@ -8,7 +8,7 @@ local mypaint_sand_colors = {
{"brown", "Brown", "190B07"},
{"cyan", "Cyan", "00ffff"},
{"darkgreen", "Dark Green", "005000"},
{"darkgery", "Dark Grey", "1C1C1C"},
{"darkgrey", "Dark Grey", "1C1C1C"},
{"grey", "Grey", "848484"},
{"magenta", "Magenta", "ff00ff"},
{"orange", "Orange", "ff7700"},

View File

@ -8,7 +8,7 @@ local mypaint_stone_colors = {
{"brown", "Brown", "190B07"},
{"cyan", "Cyan", "00ffff"},
{"darkgreen", "Dark Green", "005000"},
{"darkgery", "Dark Grey", "1C1C1C"},
{"darkgrey", "Dark Grey", "1C1C1C"},
{"grey", "Grey", "848484"},
{"magenta", "Magenta", "ff00ff"},
{"orange", "Orange", "ff7700"},

View File

@ -8,7 +8,7 @@ local mypaint_tree_colors = {
{"brown", "Brown", "190B07"},
{"cyan", "Cyan", "00ffff"},
{"darkgreen", "Dark Green", "005000"},
{"darkgery", "Dark Grey", "1C1C1C"},
{"darkgrey", "Dark Grey", "1C1C1C"},
{"grey", "Grey", "848484"},
{"magenta", "Magenta", "ff00ff"},
{"orange", "Orange", "ff7700"},