Merge Lanthanides sources

18 files changed, 0 insertions, 0 deletions

diff --git a/lath/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
index 944e36d0bc..944e36d0bc 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
+++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/Tags.java b/src/main/java/com/elisis/gtnhlanth/Tags.java
index 93666809ba..93666809ba 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/Tags.java
+++ b/src/main/java/com/elisis/gtnhlanth/Tags.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/api/recipe/LanthanidesRecipeMaps.java b/src/main/java/com/elisis/gtnhlanth/api/recipe/LanthanidesRecipeMaps.java
index 4bf100b1d4..4bf100b1d4 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/api/recipe/LanthanidesRecipeMaps.java
+++ b/src/main/java/com/elisis/gtnhlanth/api/recipe/LanthanidesRecipeMaps.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java
index 4420975173..4420975173 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java
+++ b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java
index 6e77ba200f..6e77ba200f 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
index 3c52faaf64..3c52faaf64 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
index 69aa026e47..69aa026e47 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
index 9f788c1b92..9f788c1b92 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
index 479569c7f6..479569c7f6 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
index f515024365..f515024365 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
index a0480b62dd..a0480b62dd 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java b/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java
index e24034c663..e24034c663 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index d5c7d63f8d..d5c7d63f8d 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
index 52ab4f15d1..52ab4f15d1 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java b/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java
index 28e63b2744..28e63b2744 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java
+++ b/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java
diff --git a/lath/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
index cf784d638e..cf784d638e 100644
--- a/lath/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
diff --git a/lath/src/main/resources/assets/gtnhlanth/lang/en_US.lang b/src/main/resources/assets/gtnhlanth/lang/en_US.lang
index 5aeb987b00..5aeb987b00 100644
--- a/lath/src/main/resources/assets/gtnhlanth/lang/en_US.lang
+++ b/src/main/resources/assets/gtnhlanth/lang/en_US.lang
diff --git a/lath/src/main/resources/assets/gtnhlanth/lang/zh_CN.lang b/src/main/resources/assets/gtnhlanth/lang/zh_CN.lang
index 2bd95ff47d..2bd95ff47d 100644
--- a/lath/src/main/resources/assets/gtnhlanth/lang/zh_CN.lang
+++ b/src/main/resources/assets/gtnhlanth/lang/zh_CN.lang