Skip to content

Commit

Permalink
Merge pull request #3615 from edwardspec/fix-misc-typos
Browse files Browse the repository at this point in the history 
Fix typo that prevented 8 blocks from being painted
  • Loading branch information
@sayterdarkwynd
sayterdarkwynd authored Dec 27, 2024
2 parents bedf6ee + 9e97d1f commit 6f89cba
Show file tree
Hide file tree
Showing 21 changed files with 11 additions and 25 deletions.
2 changes: 1 addition & 1 deletion tiles/materials/bamboo.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"variants" : 5,
"lightTransparent" : false,
"occludesBelow" : true,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0
}
}
2 changes: 1 addition & 1 deletion tiles/materials/brittlemetal.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"variants" : 3,
"lightTransparent" : false,
"occludesBelow" : true,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0
},
"liquidInteractions" : [
Expand Down
1 change: 0 additions & 1 deletion tiles/materials/ff_diamondblock.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "diamondblockmaterial",
"description" : "A solid block of diamond alloy.",
"shortdescription" : "Diamond block",
"multicolored" : false,
"footstepSound" : "/sfx/blocks/footstep_metallic.ogg",
"tillableMod" : 31,
"soil" : true,
Expand Down
3 changes: 1 addition & 2 deletions tiles/materials/fusteelgirdir.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "fusteelgirdirmaterial",
"description" : "A solid steel girder",
"shortdescription" : "Steel Girder",
"multicolored" : false,
"footstepSound" : "/sfx/blocks/footstep_girder.ogg",
"health" : 20,
"category": "materials",
Expand All @@ -19,4 +18,4 @@
"multiColored" : false,
"zLevel" : 100
}
}
}
1 change: 0 additions & 1 deletion tiles/materials/honey/frozenwaxblock.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"description" : "A block of frozen wax.",
"shortdescription" : "Frozen Wax Block",
"category": "material",
"multicolored" : false,
"footstepSound" : "/sfx/blocks/footstep_ice.ogg",
"health" : 3,
"renderTemplate" : "/tiles/classicmaterialtemplate.config",
Expand Down
2 changes: 1 addition & 1 deletion tiles/materials/honey/frozenwaxplatform.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"variants" : 1,
"lightTransparent" : true,
"occludesBelow" : false,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0,
"platform" : true
}
Expand Down
1 change: 0 additions & 1 deletion tiles/materials/honey/fu_honeycombblock.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "fu_honeycombblock",
"description" : "A block of honeycombs! Yum!",
"shortdescription" : "Honeycomb Block",
"multicolored" : true,
"category": "material",
"footstepSound" : "/sfx/blocks/footstep_gravel.ogg",
"health" : 5,
Expand Down
1 change: 0 additions & 1 deletion tiles/materials/honey/fu_redhoneycombblock.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "fu_redhoneycombblock",
"description" : "A block of red honeycombs! Yum!",
"shortdescription" : "Red Honeycomb Block",
"multicolored" : true,
"category": "material",
"footstepSound" : "/sfx/blocks/footstep_ice.ogg",
"health" : 5,
Expand Down
1 change: 0 additions & 1 deletion tiles/materials/honey/goldenglass/goldenglass.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"shortdescription" : "Golden Glass Block",
"glitchDescription" : "Statement. Glass.",
"floranDescription" : "Floran look pretty in glasssss.",
"multicolored" : false,
"footstepSound" : "/sfx/blocks/footstep_glass.ogg",
"health" : 3,
"renderTemplate" : "/tiles/fuclassicnopaint.config",
Expand Down
1 change: 0 additions & 1 deletion tiles/materials/honey/redwaxblock.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "redwaxblock",
"description" : "A red block of wax.",
"shortdescription" : "Red Wax Block",
"multicolored" : true,
"category": "material",
"footstepSound" : "/sfx/blocks/footstep_ice.ogg",
"health" : 3,
Expand Down
2 changes: 1 addition & 1 deletion tiles/materials/honey/redwaxplatform.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"variants" : 1,
"lightTransparent" : true,
"occludesBelow" : false,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0,
"platform" : true
}
Expand Down
1 change: 0 additions & 1 deletion tiles/materials/honey/waxblock1.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "waxblock1",
"description" : "A block of wax.",
"shortdescription" : "Wax Block",
"multicolored" : true,
"category": "material",
"footstepSound" : "/sfx/blocks/footstep_ice.ogg",
"health" : 3,
Expand Down
1 change: 0 additions & 1 deletion tiles/materials/honey/whitewaxblock.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"description" : "A block of white wax.",
"shortdescription" : "White Wax Block",
"category": "material",
"multicolored" : true,
"footstepSound" : "/sfx/blocks/footstep_ice.ogg",
"health" : 3,
"renderTemplate" : "/tiles/classicmaterialtemplate.config",
Expand Down
1 change: 0 additions & 1 deletion tiles/materials/penumbriteblock.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "penumbriteblockmaterial",
"description" : "A solid block of penumbrite alloy.",
"shortdescription" : "Penumbrite block",
"multicolored" : false,
"footstepSound" : "/sfx/blocks/footstep_metallic.ogg",
"health" : 44,
"category": "materials",
Expand Down
2 changes: 1 addition & 1 deletion tiles/materials/pixelgoods/fujellyblock2.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"variants" : 5,
"lightTransparent" : false,
"occludesBelow" : true,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0
}
}
2 changes: 1 addition & 1 deletion tiles/materials/pixelgoods/fuokeagrass.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"variants" : 5,
"lightTransparent" : false,
"occludesBelow" : true,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0
}
}
Expand Down
2 changes: 1 addition & 1 deletion tiles/materials/pixelgoods/fuokeahitechwall1.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"variants" : 15,
"lightTransparent" : false,
"occludesBelow" : true,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0
}
}
3 changes: 1 addition & 2 deletions tiles/materials/pixelgoods/fuokeahitechwall2.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "fuokeahitechwall2",
"description" : "Plasteel is pretty awesome.",
"shortdescription" : "Plasteel Tile",
"multicolored" : true,
"footstepSound" : "/sfx/blocks/footstep_metallic.ogg",
"health" : 20,
"category": "materials",
Expand All @@ -16,7 +15,7 @@
"variants" : 1,
"lightTransparent" : false,
"occludesBelow" : true,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0
}
}
3 changes: 1 addition & 2 deletions tiles/materials/pixelgoods/fuokeamagmabrick.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"materialName" : "fuokeamagmabrick",
"particleColor" : [80, 80, 80, 255],
"itemDrop" : "fuokeamagmabrick",
"multicolored" : true,
"description" : "Bricks made out of magmastone and hellfire.",
"shortdescription" : "Hellfire Bricks",
"footstepSound" : "/sfx/blocks/footstep_stone3.ogg",
Expand All @@ -16,7 +15,7 @@
"variants" : 10,
"lightTransparent" : false,
"occludesBelow" : true,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0
}
}
3 changes: 1 addition & 2 deletions tiles/materials/pixelgoods/fuokeamagmastone.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "fuokeamagmastone",
"description" : "Stone made out of magmastone and hellfire.",
"shortdescription" : "Hellfire Stone",
"multicolored" : true,
"footstepSound" : "/sfx/blocks/footstep_stone3.ogg",
"health" : 30,
"category": "materials",
Expand All @@ -16,7 +15,7 @@
"variants" : 5,
"lightTransparent" : false,
"occludesBelow" : true,
"multicolored" : true,
"multiColored" : true,
"zLevel" : 0
}
}
1 change: 0 additions & 1 deletion tiles/materials/protoblock.material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"itemDrop" : "protoblockmaterial",
"description" : "A solid block of protocite.",
"shortdescription" : "Protocite block",
"multicolored" : false,
"footstepSound" : "/sfx/blocks/footstep_metallic.ogg",
"health" : 24,
"category": "materials",
Expand Down

0 comments on commit 6f89cba

Please sign in to comment.