提交: f34363a6579ce20c9d500e9a2f3f214d7243b960 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• 修订版: f34363a6579ce20c9d500e9a2f3f214d7243b960 (tree)
• 时间: 2020-04-21 05:11:35
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

W.I.P. VII: Additional changes, tweaks, new model...

更改概述

• modified: Assorted/Assorted.csproj
• modified: Assorted/BlockEntityClasses/BoltableDoorBlockEntity.cs
• modified: Assorted/assets/defensive/blocktypes/iron/grille_horizontal.json
• modified: Assorted/assets/defensive/blocktypes/iron/grille_vertical.json
• modified: Assorted/assets/defensive/blocktypes/wood/boltable_door.json
• modified: Assorted/assets/defensive/lang/en.json
• add: Assorted/assets/defensive/recipes/grid/heavydoor.json
• add: Assorted/assets/defensive/recipes/smithing/grille_h.json
• delete: Assorted/assets/defensive/recipes/smithing/{grille.json => grille_v.json}
• modified: Assorted/assets/defensive/shapes/block/iron/grille_horizontal.json
• add: Assorted/assets/defensive/shapes/block/wood/heavydoor_inv.json
• modified: Assorted/modinfo.json

差异

--- a/Assorted/Assorted.csproj
+++ b/Assorted/Assorted.csproj
@@ -80,6 +80,7 @@
     <Folder Include="assets\" />
     <Folder Include="BlockEntityClasses\" />
     <Folder Include="BlockBehaviors\" />
+    <Folder Include="assets\defensive\recipes\grid\" />
   </ItemGroup>
   <ItemGroup>
     <None Include="assets\defensive\blocktypes\iron\grille_horizontal.json">
@@ -97,7 +98,7 @@
     <None Include="assets\defensive\lang\en.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="assets\defensive\recipes\smithing\grille.json">
+    <None Include="assets\defensive\recipes\smithing\grille_v.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Include="assets\defensive\shapes\block\iron\grille_horizontal.json">
@@ -128,6 +129,15 @@
     <None Include="modinfo.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="assets\defensive\recipes\smithing\grille_h.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\defensive\recipes\grid\heavydoor.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="assets\defensive\shapes\block\wood\heavydoor_inv.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

--- a/Assorted/BlockEntityClasses/BoltableDoorBlockEntity.cs
+++ b/Assorted/BlockEntityClasses/BoltableDoorBlockEntity.cs
@@ -44,7 +44,7 @@ namespace FirstMachineAge
 		var boltableDoor = this.Block as BoltableDoor;
 		BoltableDoorBlockEntity realEntity = boltableDoor.Entity(this.Pos.Copy( ));
 		
-		dsc.AppendLine($"Bolted: {(realEntity.Bolted?"Yes":"No")}");		
+		dsc.AppendLine($"Bolted: {(realEntity.Bolted?"<font color='red'>Yes</font>":"No")}");		
 		}
 	}
 }

--- a/Assorted/assets/defensive/blocktypes/iron/grille_horizontal.json
+++ b/Assorted/assets/defensive/blocktypes/iron/grille_horizontal.json
@@ -21,7 +21,7 @@
 		all: false
 	},
 	behaviors: [
-		{name: "HorizontalOrientable", properties: {  dropBlockFace: "north" }}, {name: "FreeReinforcement", properties: { howmuch: 5 }}	
+		{name: "HorizontalOrientable", properties: {  dropBlockFace: "north" }}, {name: "FreeReinforcement", properties: { howmuch: 15 }}	
 	],
 	creativeinventory: { "general": ["grille_horizontal-*"], "decorative": ["grille_horizontal-*"] },	
 	resistance: 4,

--- a/Assorted/assets/defensive/blocktypes/iron/grille_vertical.json
+++ b/Assorted/assets/defensive/blocktypes/iron/grille_vertical.json
@@ -20,7 +20,7 @@
 	},
 	behaviors: [
 		{name: "HorizontalUpDownOrientable" },
-		{name: "FreeReinforcement", properties: { howmuch: 5 }}
+		{name: "FreeReinforcement", properties: { howmuch: 15 }}
 	],
 	creativeinventory: { "general": ["grille_vertical-*"], "decorative": ["grille_vertical-*"] },	
 	resistance: 4,

--- a/Assorted/assets/defensive/blocktypes/wood/boltable_door.json
+++ b/Assorted/assets/defensive/blocktypes/wood/boltable_door.json
@@ -12,6 +12,9 @@
 			groupBy: ["woodendoor-*"]
 		},
 	},
+    behaviors: [
+		 {name: "FreeReinforcement", properties: { howmuch: 5 } }	
+	],
 	variantgroups: [
 		{ loadFromProperties: "abstract/horizontalorientation" },
 		{ code: "part", states: ["down", "up"] },
@@ -23,6 +26,7 @@
 		"oak2": { base:"game:block/wood/planks/oak2"},
 		"oak1": { base:"game:block/wood/planks/oak1"}				
 	},
+    shapeinventory: { base: "block/wood/heavydoor_inv" },
 	shapebytype: {
 		"*-north-down-closed": { base: "block/wood/heavydoor_lower_closed_left", rotateY: 90 },
 		"*-north-up-closed": { base: "block/wood/heavydoor_upper_closed_left", rotateY: 90 },

--- a/Assorted/assets/defensive/lang/en.json
+++ b/Assorted/assets/defensive/lang/en.json
@@ -1,6 +1,8 @@
 {
 	"defensive:block-grille_vertical-*": "Grille (Iron)",
-	"defensive:itemdesc-grille_vertical-*": "A grille of latticed wrought iron bars.",
+	"defensive:itemdesc-grille_vertical-*": "A vertical grille of latticed wrought iron bars.",
 	"defensive:ingameerror-boltedclosed":"Bolted Shut.",
 	"defensive:block-boltable_door-*":"Heavy wooden door",
+    "defensive:block-grille_horizontal-*": "Grille (Iron)",
+	"defensive:itemdesc-grille_horizontal-*": "A horizontal grille of latticed wrought iron bars.",
 }
\ No newline at end of file

--- /dev/null
+++ b/Assorted/assets/defensive/recipes/grid/heavydoor.json
@@ -0,0 +1,11 @@
+{
+	ingredientPattern: "WPW	WSW	WPW",
+	ingredients: {
+		"W": { type: "item", code: "game:plank-*" },
+        "P": { type:"block", code:"game:plankslab-*"},
+        "S": { type: "item", code: "game:stick" },
+	},
+	width: 3,
+	height: 3,
+	output: { type: "block", code: "defensive:boltable_door-north-down-closed"  }
+}

--- /dev/null
+++ b/Assorted/assets/defensive/recipes/smithing/grille_h.json
@@ -0,0 +1,16 @@
+{
+	ingredient: { type: "item", code: "game:ingot-iron", name: "metal" },
+	pattern: [[
+		"_#___#___#_",
+		"_#___#___#_",
+		"###########",
+		"_#___#___#_",
+		"###########",
+		"_#___#___#_",		
+		"###########",
+        "_#___#___#_",
+		"_#___#___#_",		
+	]],
+	name: "Lattice Iron Grille",
+	output: { type: "block", code: "defensive:grille_horizontal-north", stacksize: 3  }
+}
\ No newline at end of file

--- a/Assorted/assets/defensive/recipes/smithing/grille.json
+++ b/Assorted/assets/defensive/recipes/smithing/grille_v.json
@@ -1,15 +1,15 @@
 {
 	ingredient: { type: "item", code: "game:ingot-iron", name: "metal" },
 	pattern: [[
-		"_##_____##_",
-		"_#########_",
-		"_#########_",
-		"_##_____##_",
-		"_##_____##_",
-		"_##_____##_",
-		"_#########_",
-		"_#########_",
-		"_##_____##_",		
+		"_#_______#_",		
+		"_#_______#_",		
+		"###########",
+		"_#_______#_",		
+		"_#_______#_",		
+		"_#_______#_",		
+		"###########",
+		"_#_______#_",		
+		"_#_______#_",		
 	]],
 	name: "Lattice Iron Grille",
 	output: { type: "block", code: "defensive:grille_vertical-north", stacksize: 3  }

--- a/Assorted/assets/defensive/shapes/block/iron/grille_horizontal.json
+++ b/Assorted/assets/defensive/shapes/block/iron/grille_horizontal.json
@@ -1,61 +1,63 @@
 {
 	"editor": {
 		"allAngles": false,
-		"singleTexture": false
+		"entityTextureMode": false
 	},
 	"textureWidth": 16,
 	"textureHeight": 16,
+	"textureSizes": {
+	},
 	"textures": {
 		"iron": "block/metal/plate/iron"
 	},
 	"elements": [
 		{
 			"name": "LeftBar",
-			"from": [ 2.0, 0.0, 1.0 ], 
-			"to": [ 4.0, 16.0, 1.5 ], 
-			"rotationOrigin": [ 8.0, 0.0, 8.0 ],
+			"from": [ 2.0, -0.5, 1.0 ], 
+			"to": [ 4.0, 16.5, 1.5 ], 
+			"rotationOrigin": [ 8.0, -1.0, 8.0 ],
 			"faces": {
-				"north": { "texture": "#iron", "uv": [ 4.5, 0.0, 6.5, 16.0 ] },
-				"east": { "texture": "#iron", "uv": [ 8.0, 0.0, 8.5, 16.0 ] },
-				"south": { "texture": "#iron", "uv": [ 5.5, 0.0, 7.5, 16.0 ] },
-				"west": { "texture": "#iron", "uv": [ 9.0, 0.0, 9.5, 16.0 ] },
+				"north": { "texture": "#iron", "uv": [ 4.5, 0.0, 6.5, 16.0 ], "autoUv": false, "snapUv": false },
+				"east": { "texture": "#iron", "uv": [ 8.0, 0.0, 8.5, 16.0 ], "autoUv": false, "snapUv": false },
+				"south": { "texture": "#iron", "uv": [ 5.5, 0.0, 7.5, 16.0 ], "autoUv": false, "snapUv": false },
+				"west": { "texture": "#iron", "uv": [ 9.0, 0.0, 9.5, 16.0 ], "autoUv": false, "snapUv": false },
 				"up": { "texture": "#iron", "uv": [ 8.0, 6.5, 10.0, 7.0 ] },
 				"down": { "texture": "#iron", "uv": [ 4.0, 7.5, 6.0, 8.0 ] }
 			}
 		},
 		{
 			"name": "RightBar",
-			"from": [ 12.0, 0.0, 1.0 ], 
-			"to": [ 14.0, 16.0, 1.5 ], 
+			"from": [ 12.0, -0.5, 1.0 ], 
+			"to": [ 14.0, 16.5, 1.5 ], 
 			"rotationOrigin": [ 8.0, 0.0, 8.0 ],
 			"faces": {
-				"north": { "texture": "#iron", "uv": [ 7.0, 0.0, 9.0, 16.0 ] },
-				"east": { "texture": "#iron", "uv": [ 11.5, 0.0, 12.0, 16.0 ] },
-				"south": { "texture": "#iron", "uv": [ 13.5, 0.0, 15.5, 16.0 ] },
-				"west": { "texture": "#iron", "uv": [ 15.0, 0.0, 15.5, 16.0 ] },
+				"north": { "texture": "#iron", "uv": [ 7.0, 0.0, 9.0, 16.0 ], "autoUv": false, "snapUv": false },
+				"east": { "texture": "#iron", "uv": [ 11.5, 0.0, 12.0, 16.0 ], "autoUv": false, "snapUv": false },
+				"south": { "texture": "#iron", "uv": [ 13.5, 0.0, 15.5, 16.0 ], "autoUv": false, "snapUv": false },
+				"west": { "texture": "#iron", "uv": [ 15.0, 0.0, 15.5, 16.0 ], "autoUv": false, "snapUv": false },
 				"up": { "texture": "#iron", "uv": [ 12.5, 11.5, 14.5, 12.0 ] },
 				"down": { "texture": "#iron", "uv": [ 5.0, 4.5, 7.0, 5.0 ] }
 			}
 		},
 		{
 			"name": "UpperBar",
-			"from": [ 0.0, 12.0, 1.5 ], 
-			"to": [ 16.0, 14.0, 2.0 ], 
+			"from": [ -0.5, 12.0, 1.5 ], 
+			"to": [ 16.5, 14.0, 2.0 ], 
 			"rotationOrigin": [ 0.0, 12.0, 8.0 ],
 			"faces": {
-				"north": { "texture": "#iron", "uv": [ 0.0, 6.5, 16.0, 8.5 ] },
+				"north": { "texture": "#iron", "uv": [ 0.0, 6.5, 16.0, 8.5 ], "autoUv": false, "snapUv": false },
 				"east": { "texture": "#iron", "uv": [ 2.5, 12.0, 3.0, 14.0 ] },
-				"south": { "texture": "#iron", "uv": [ 0.0, 5.5, 16.0, 7.5 ] },
+				"south": { "texture": "#iron", "uv": [ 0.0, 5.5, 16.0, 7.5 ], "autoUv": false, "snapUv": false },
 				"west": { "texture": "#iron", "uv": [ 0.5, 5.5, 1.0, 7.5 ] },
-				"up": { "texture": "#iron", "uv": [ 0.0, 3.0, 16.0, 3.5 ] },
-				"down": { "texture": "#iron", "uv": [ 0.0, 5.0, 16.0, 5.5 ] }
+				"up": { "texture": "#iron", "uv": [ 0.0, 3.0, 16.0, 3.5 ], "autoUv": false, "snapUv": false },
+				"down": { "texture": "#iron", "uv": [ 0.0, 5.0, 16.0, 5.5 ], "autoUv": false, "snapUv": false }
 			},
 			"children": [
 				{
 					"name": "Rivet3",
-					"from": [ 2.5, 0.5, -1.0 ], 
-					"to": [ 3.5, 1.5, 0.75 ], 
-					"rotationOrigin": [ 3.0, 1.0, -1.0 ],
+					"from": [ 1.75, -0.25, -1.0 ], 
+					"to": [ 2.75, 0.75, 0.75 ], 
+					"rotationOrigin": [ 2.0, 2.0, -1.0 ],
 					"rotationZ": 45.0,
 					"faces": {
 						"north": { "texture": "#rivets", "uv": [ 4.0, 8.0, 5.0, 9.0 ] },
@@ -68,8 +70,8 @@
 				},
 				{
 					"name": "Rivet4",
-					"from": [ 12.5, 0.5, -1.0 ], 
-					"to": [ 13.5, 1.5, 1.0 ], 
+					"from": [ 12.75, 0.25, -1.0 ], 
+					"to": [ 13.75, 1.25, 1.0 ], 
 					"rotationOrigin": [ 13.0, 1.0, -1.0 ],
 					"rotationZ": 45.0,
 					"faces": {
@@ -85,23 +87,23 @@
 		},
 		{
 			"name": "LowerBar",
-			"from": [ 0.0, 2.0, 1.5 ], 
-			"to": [ 16.0, 4.0, 2.0 ], 
+			"from": [ -0.5, 2.0, 1.5 ], 
+			"to": [ 16.5, 4.0, 2.0 ], 
 			"rotationOrigin": [ 0.0, 2.0, 8.0 ],
 			"faces": {
-				"north": { "texture": "#iron", "uv": [ 0.0, 3.5, 16.0, 5.5 ] },
+				"north": { "texture": "#iron", "uv": [ 0.0, 3.5, 16.0, 5.5 ], "autoUv": false, "snapUv": false },
 				"east": { "texture": "#iron", "uv": [ 3.0, 3.0, 3.5, 5.0 ] },
-				"south": { "texture": "#iron", "uv": [ 0.0, 2.0, 16.0, 4.0 ] },
+				"south": { "texture": "#iron", "uv": [ 0.0, 1.0, 16.0, 3.0 ], "autoUv": false, "snapUv": false },
 				"west": { "texture": "#iron", "uv": [ 0.0, 0.0, 0.5, 2.0 ] },
-				"up": { "texture": "#iron", "uv": [ 0.0, 9.0, 16.0, 9.5 ] },
-				"down": { "texture": "#iron", "uv": [ 0.0, 2.0, 16.0, 2.5 ] }
+				"up": { "texture": "#iron", "uv": [ 0.0, 9.0, 16.0, 9.5 ], "autoUv": false, "snapUv": false },
+				"down": { "texture": "#iron", "uv": [ 0.0, 2.0, 16.0, 2.5 ], "autoUv": false, "snapUv": false }
 			},
 			"children": [
 				{
 					"name": "Rivet1",
 					"from": [ 2.75, 0.5, -1.0 ], 
 					"to": [ 3.75, 1.5, 1.0 ], 
-					"rotationOrigin": [ 3.25, 0.75, 0.0 ],
+					"rotationOrigin": [ 3.5, 1.25, 0.0 ],
 					"rotationZ": 45.0,
 					"faces": {
 						"north": { "texture": "#rivets", "uv": [ 6.0, 6.5, 7.0, 7.5 ] },
@@ -116,7 +118,7 @@
 					"name": "Rivet2",
 					"from": [ 12.75, 0.5, -1.0 ], 
 					"to": [ 13.75, 1.5, 1.0 ], 
-					"rotationOrigin": [ 13.25, 0.75, -1.0 ],
+					"rotationOrigin": [ 13.25, 1.25, -1.0 ],
 					"rotationZ": 45.0,
 					"faces": {
 						"north": { "texture": "#rivets", "uv": [ 3.5, 6.5, 4.5, 7.5 ] },

--- /dev/null
+++ b/Assorted/assets/defensive/shapes/block/wood/heavydoor_inv.json
@@ -0,0 +1,130 @@
+{
+	"editor": {
+		"allAngles": false,
+		"entityTextureMode": false
+	},
+	"textureWidth": 16,
+	"textureHeight": 16,
+	"textureSizes": {
+	},
+	"textures": {
+		"wall-inside": "block/wood/crate/wall-inside",
+		"oak2": "block/wood/planks/oak2",
+		"oak1": "block/wood/planks/oak1"
+	},
+	"elements": [
+		{
+			"name": "Centerpanels",
+			"from": [ 0.0, 0.0, 6.0 ], 
+			"to": [ 16.0, 32.0, 8.0 ], 
+			"faces": {
+				"north": { "texture": "#wall-inside", "uv": [ 2.0, 3.0, 14.0, 16.0 ], "autoUv": false, "snapUv": false },
+				"east": { "texture": "#wall-inside", "uv": [ 4.5, 2.5, 7.5, 15.5 ], "autoUv": false, "snapUv": false },
+				"south": { "texture": "#wall-inside", "uv": [ 2.0, 3.0, 14.0, 16.0 ], "autoUv": false, "snapUv": false },
+				"west": { "texture": "#wall-inside", "uv": [ 1.0, 3.0, 4.0, 16.0 ], "autoUv": false, "snapUv": false },
+				"up": { "texture": "#wall-inside", "uv": [ 1.5, 3.0, 14.5, 5.0 ], "autoUv": false, "snapUv": false },
+				"down": { "texture": "#wall-inside", "uv": [ 1.0, 2.5, 14.0, 4.5 ], "rotation": 90, "autoUv": false, "snapUv": false }
+			}
+		},
+		{
+			"name": "LowerBrace",
+			"from": [ 0.5, 2.0, 5.5 ], 
+			"to": [ 15.5, 5.0, 6.5 ], 
+			"rotationOrigin": [ 8.0, 0.0, 8.0 ],
+			"faces": {
+				"north": { "texture": "#oak1", "uv": [ 0.5, 12.0, 15.5, 15.0 ] },
+				"east": { "texture": "#oak1", "uv": [ 1.0, 7.0, 2.0, 10.0 ] },
+				"south": { "texture": "#oak1", "uv": [ 0.5, 2.0, 15.5, 5.0 ] },
+				"west": { "texture": "#oak1", "uv": [ 1.0, 7.0, 2.0, 10.0 ] },
+				"up": { "texture": "#oak1", "uv": [ 0.0, 0.5, 15.0, 1.5 ] },
+				"down": { "texture": "#oak1", "uv": [ 0.5, 3.0, 15.5, 4.0 ] }
+			}
+		},
+		{
+			"name": "Handle",
+			"from": [ -2.0, 13.0, -7.5 ], 
+			"to": [ -1.0, 19.5, -6.5 ], 
+			"rotationOrigin": [ 8.0, 0.0, 0.0 ],
+			"rotationY": 90.0,
+			"faces": {
+				"north": { "texture": "#oak2", "uv": [ 7.5, 2.0, 14.0, 3.0 ], "rotation": 90 },
+				"east": { "texture": "#oak2", "uv": [ 7.5, 2.0, 14.0, 3.0 ], "rotation": 90 },
+				"south": { "texture": "#oak2", "uv": [ 7.5, 2.5, 14.0, 3.5 ], "rotation": 90 },
+				"west": { "texture": "#oak2", "uv": [ 8.0, 2.0, 14.5, 3.0 ], "rotation": 90 },
+				"up": { "texture": "#oak2", "uv": [ 5.5, 2.5, 6.5, 3.5 ] },
+				"down": { "texture": "#oak2", "uv": [ 6.0, 4.0, 7.0, 5.0 ] }
+			},
+			"children": [
+				{
+					"name": "H_support",
+					"from": [ 1.0, 0.0, 0.0 ], 
+					"to": [ 2.0, 1.0, 1.0 ], 
+					"rotationOrigin": [ 1.0, 0.0, 0.0 ],
+					"faces": {
+						"north": { "texture": "#oak2", "uv": [ 0.0, 2.5, 1.0, 3.5 ] },
+						"east": { "texture": "#oak2", "uv": [ 0.0, 2.5, 1.0, 3.5 ] },
+						"south": { "texture": "#oak2", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"west": { "texture": "#oak2", "uv": [ 0.0, 2.5, 1.0, 3.5 ] },
+						"up": { "texture": "#oak2", "uv": [ 0.0, 2.5, 1.0, 3.5 ] },
+						"down": { "texture": "#oak2", "uv": [ 0.0, 2.0, 1.0, 3.0 ] }
+					}
+				},
+				{
+					"name": "H_support2",
+					"from": [ 1.0, 5.5, 0.0 ], 
+					"to": [ 2.0, 6.5, 1.0 ], 
+					"rotationOrigin": [ 1.0, 6.0, 0.0 ],
+					"faces": {
+						"north": { "texture": "#oak2", "uv": [ 0.0, 2.5, 1.0, 3.5 ] },
+						"east": { "texture": "#oak2", "uv": [ 0.0, 2.5, 1.0, 3.5 ] },
+						"south": { "texture": "#oak2", "uv": [ 0.0, 2.0, 1.0, 3.0 ] },
+						"west": { "texture": "#oak2", "uv": [ 0.0, 2.5, 1.0, 3.5 ] },
+						"up": { "texture": "#oak2", "uv": [ 0.0, 2.5, 1.0, 3.5 ] },
+						"down": { "texture": "#oak2", "uv": [ 0.0, 2.0, 1.0, 3.0 ] }
+					}
+				}
+			]
+		},
+		{
+			"name": "UpperBrace",
+			"from": [ 0.5, 11.0, 5.5 ], 
+			"to": [ 15.5, 14.0, 6.5 ], 
+			"rotationOrigin": [ 8.0, 0.0, 8.0 ],
+			"faces": {
+				"north": { "texture": "#oak1", "uv": [ 0.5, 2.5, 15.5, 5.5 ] },
+				"east": { "texture": "#oak1", "uv": [ 0.5, 12.0, 1.5, 15.0 ] },
+				"south": { "texture": "#oak1", "uv": [ 0.5, 1.5, 15.5, 4.5 ] },
+				"west": { "texture": "#oak1", "uv": [ 0.5, 2.0, 1.5, 5.0 ] },
+				"up": { "texture": "#oak1", "uv": [ 0.5, 1.0, 15.5, 2.0 ] },
+				"down": { "texture": "#oak1", "uv": [ 0.0, 3.0, 15.0, 4.0 ] }
+			}
+		},
+		{
+			"name": "LowerBrace2",
+			"from": [ 0.5, 18.0, 5.5 ], 
+			"to": [ 15.5, 21.0, 6.5 ], 
+			"rotationOrigin": [ 8.0, 16.0, 8.0 ],
+			"faces": {
+				"north": { "texture": "#oak1", "uv": [ 0.5, 12.0, 15.5, 15.0 ] },
+				"east": { "texture": "#oak1", "uv": [ 1.0, 7.0, 2.0, 10.0 ] },
+				"south": { "texture": "#oak1", "uv": [ 0.5, 2.0, 15.5, 5.0 ] },
+				"west": { "texture": "#oak1", "uv": [ 1.0, 7.0, 2.0, 10.0 ] },
+				"up": { "texture": "#oak1", "uv": [ 0.0, 0.5, 15.0, 1.5 ] },
+				"down": { "texture": "#oak1", "uv": [ 0.5, 3.0, 15.5, 4.0 ] }
+			}
+		},
+		{
+			"name": "UpperBrace2",
+			"from": [ 0.5, 27.0, 5.5 ], 
+			"to": [ 15.5, 30.0, 6.5 ], 
+			"rotationOrigin": [ 8.0, 16.0, 8.0 ],
+			"faces": {
+				"north": { "texture": "#oak1", "uv": [ 0.5, 2.5, 15.5, 5.5 ] },
+				"east": { "texture": "#oak1", "uv": [ 0.5, 12.0, 1.5, 15.0 ] },
+				"south": { "texture": "#oak1", "uv": [ 0.5, 1.5, 15.5, 4.5 ] },
+				"west": { "texture": "#oak1", "uv": [ 0.5, 2.0, 1.5, 5.0 ] },
+				"up": { "texture": "#oak1", "uv": [ 0.5, 1.0, 15.5, 2.0 ] },
+				"down": { "texture": "#oak1", "uv": [ 0.0, 3.0, 15.0, 4.0 ] }
+			}
+		}
+	]}
\ No newline at end of file

--- a/Assorted/modinfo.json
+++ b/Assorted/modinfo.json
@@ -1,7 +1,7 @@
 {
   "type": "code",
   "name": "Defensive Structures",
-  "description" : "Buildable structures and emplacments, for Defense!",
+  "description" : "Defensive structures and emplacements, ideal for castles...",
   "authors": ["Melchior"],
   "version": "0.1.1",
   "dependencies": {