diff options
author | Bass <tudurap.com@gmail.com> | 2019-01-24 13:21:54 +0000 |
---|---|---|
committer | Bass <tudurap.com@gmail.com> | 2019-01-24 13:21:54 +0000 |
commit | 01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343 (patch) | |
tree | ca6d3cd201ed95820caa9c828ea03c0f25ecd76a /src/main/resources/com | |
parent | 1b40750ba5059473a99a064faa7342fc60a2de89 (diff) | |
parent | b24709d41d33f1f76f2e6852323d2b5cd90bb4b0 (diff) | |
download | GT5-Unofficial-01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343.tar.gz GT5-Unofficial-01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343.tar.bz2 GT5-Unofficial-01a7f4d9e5ba8a042b7b019a7b9bb35f9fd3a343.zip |
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src/main/resources/com')
-rw-r--r-- | src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/energyLevels.csv (renamed from src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/energyLevels.csv) | 0 | ||||
-rw-r--r-- | src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclides.csv (renamed from src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclides.csv) | 0 | ||||
-rw-r--r-- | src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclidesTable.csv (renamed from src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclidesTable.csv) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/energyLevels.csv b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/energyLevels.csv index 484768d8b7..484768d8b7 100644 --- a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/energyLevels.csv +++ b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/energyLevels.csv diff --git a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclides.csv b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclides.csv index 495aee32bf..495aee32bf 100644 --- a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclides.csv +++ b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclides.csv diff --git a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclidesTable.csv b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclidesTable.csv index 783276227a..783276227a 100644 --- a/src/main/resources/com/github/technus/tectech/elementalMatter/definitions/complex/atom/nuclidesTable.csv +++ b/src/main/resources/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/atom/nuclidesTable.csv |