Merge pull request #18 from Imaginos16/ores

Adds Ores!
blocktest-game · Nov 6, 2023 · f1946aa · f1946aa
2 parents 0db4824 + 01556e0
commit f1946aa
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 0 deletions.
diff --git a/Blocktest/Content/Graphics/Blocks/copper.png b/Blocktest/Content/Graphics/Blocks/copper.png
diff --git a/Blocktest/Content/Graphics/Blocks/gold.png b/Blocktest/Content/Graphics/Blocks/gold.png
diff --git a/Blocktest/Content/Graphics/Blocks/iron.png b/Blocktest/Content/Graphics/Blocks/iron.png
diff --git a/Blocktest/Content/Graphics/Blocks/silver.png b/Blocktest/Content/Graphics/Blocks/silver.png
diff --git a/Blocktest/Icon.bmp b/Blocktest/Icon.bmp
diff --git a/Shared/Content/Blocks/Copper.yml b/Shared/Content/Blocks/Copper.yml
@@ -0,0 +1,2 @@
+BlockName: Copper
+BlockSmoothing: true
diff --git a/Shared/Content/Blocks/Gold.yml b/Shared/Content/Blocks/Gold.yml
@@ -0,0 +1,2 @@
+BlockName: Gold
+BlockSmoothing: true
diff --git a/Shared/Content/Blocks/Iron.yml b/Shared/Content/Blocks/Iron.yml
@@ -0,0 +1,2 @@
+BlockName: Iron
+BlockSmoothing: true
diff --git a/Shared/Content/Blocks/Silver.yml b/Shared/Content/Blocks/Silver.yml
@@ -0,0 +1,2 @@
+BlockName: Silver
+BlockSmoothing: true
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
@@ -12,4 +12,10 @@
         <EmbeddedResource Include="blocks.schema.json"/>
         <EmbeddedResource Include="Content\**\*.*"/>
     </ItemGroup>
+    <ItemGroup>
+      <None Remove="content\blocks\Copper.yml" />
+      <None Remove="content\blocks\Gold.yml" />
+      <None Remove="content\blocks\Iron.yml" />
+      <None Remove="content\blocks\Silver.yml" />
+    </ItemGroup>
 </Project>