aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-04-07 07:08:39 +0200
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-04-07 07:08:39 +0200
commite47085d1eae7fcd3f1e858c67e75bb4ed936e351 (patch)
tree787b6453ef1c8d7ae2ed7e14dd05505f744787d2 /src/main/resources
parent6ba77e6b461080be8389d721ff8656e5b0c93281 (diff)
downloadGT5-Unofficial-e47085d1eae7fcd3f1e858c67e75bb4ed936e351.tar.gz
GT5-Unofficial-e47085d1eae7fcd3f1e858c67e75bb4ed936e351.tar.bz2
GT5-Unofficial-e47085d1eae7fcd3f1e858c67e75bb4ed936e351.zip
Giant Materials/Space Compat update
+added ASM +added a shit ton of materials and got my own Materials system up and running +added Ross128 when GC is installed Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: 6e298a2662d8874903210037f7faa53d9aa83f40
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/bartworks/lang/en_US.lang9
-rw-r--r--src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128.pngbin0 -> 934 bytes
-rw-r--r--src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128b.pngbin0 -> 1048 bytes
-rw-r--r--src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128ba.pngbin0 -> 990 bytes
-rw-r--r--src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/World/SunRoss128.pngbin0 -> 1260 bytes
5 files changed, 8 insertions, 1 deletions
diff --git a/src/main/resources/assets/bartworks/lang/en_US.lang b/src/main/resources/assets/bartworks/lang/en_US.lang
index fb9f53db31..773214b1f7 100644
--- a/src/main/resources/assets/bartworks/lang/en_US.lang
+++ b/src/main/resources/assets/bartworks/lang/en_US.lang
@@ -141,4 +141,11 @@ tile.biolab.name=Bio Lab
tile.biovat.name=Bacterial Vat
tile.radiohatch.name=Radio Hatch
tile.bw.windmill.name=Windmill
-tile.manutrafo.name=Manual Trafo \ No newline at end of file
+tile.manutrafo.name=Manual Trafo
+
+itemGroup.bartworksMetaMaterials=BartWorks' Meta Materials
+
+planet.Ross128b=Ross128b
+moon.Ross128ba=Ross128ba
+star.Ross128=Ross128
+solarsystem.Ross128System=Ross128-System \ No newline at end of file
diff --git a/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128.png b/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128.png
new file mode 100644
index 0000000000..18e7cd3b3c
--- /dev/null
+++ b/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128.png
Binary files differ
diff --git a/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128b.png b/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128b.png
new file mode 100644
index 0000000000..85b66ad2a5
--- /dev/null
+++ b/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128b.png
Binary files differ
diff --git a/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128ba.png b/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128ba.png
new file mode 100644
index 0000000000..745d1131c3
--- /dev/null
+++ b/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128ba.png
Binary files differ
diff --git a/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/World/SunRoss128.png b/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/World/SunRoss128.png
new file mode 100644
index 0000000000..d966674e54
--- /dev/null
+++ b/src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/World/SunRoss128.png
Binary files differ