aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorTec <daniel112092@gmail.com>2019-07-17 23:16:18 +0200
committerTec <daniel112092@gmail.com>2019-07-17 23:16:18 +0200
commit03cc85c98d93da4d91ba1a8b064f884120826d34 (patch)
treebb1b34bbbc76e62620137d69b1b5d90b6b246791 /src/main/resources
parent396152d095c1cac5635dec3dd31b3d814d480ed2 (diff)
parentab28eb1586f1ff4fa41e4cfa20ee802ffc4fc516 (diff)
downloadGT5-Unofficial-03cc85c98d93da4d91ba1a8b064f884120826d34.tar.gz
GT5-Unofficial-03cc85c98d93da4d91ba1a8b064f884120826d34.tar.bz2
GT5-Unofficial-03cc85c98d93da4d91ba1a8b064f884120826d34.zip
Merge branch 'ActuallyBetterParametrizers' into BassAddons
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/energyLevels.csv (renamed from src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/energyLevels.csv)0
-rw-r--r--src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/nuclides.csv (renamed from src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclides.csv)0
-rw-r--r--src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/nuclidesTable.csv (renamed from src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclidesTable.csv)0
3 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/energyLevels.csv b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/energyLevels.csv
index 484768d8b7..484768d8b7 100644
--- a/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/energyLevels.csv
+++ b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/energyLevels.csv
diff --git a/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclides.csv b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/nuclides.csv
index 495aee32bf..495aee32bf 100644
--- a/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclides.csv
+++ b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/nuclides.csv
diff --git a/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclidesTable.csv b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/nuclidesTable.csv
index 783276227a..783276227a 100644
--- a/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclidesTable.csv
+++ b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/nuclidesTable.csv