diff options
| author | Matt <mtthw8198@gmail.com> | 2021-06-01 14:18:25 -0700 |
|---|---|---|
| committer | Matt <mtthw8198@gmail.com> | 2021-06-01 14:18:25 -0700 |
| commit | f87217e9a044b0f017d4b821017f697ca6568f42 (patch) | |
| tree | aad0a14640e146837c950157750e3ad6cca88ea5 /src/main/java/gregtech/api/enchants | |
| parent | 08aa6a7f525eea881a00331bc75f055c3d275c3e (diff) | |
| parent | 9555f77feccabf92d3bcc20c985c2060e2455600 (diff) | |
| download | GT5-Unofficial-f87217e9a044b0f017d4b821017f697ca6568f42.tar.gz GT5-Unofficial-f87217e9a044b0f017d4b821017f697ca6568f42.tar.bz2 GT5-Unofficial-f87217e9a044b0f017d4b821017f697ca6568f42.zip | |
Merge remote-tracking branch 'origin/experimental' into experimental
Diffstat (limited to 'src/main/java/gregtech/api/enchants')
| -rw-r--r-- | src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java index 102d78d430..9a9521d130 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_EnderDamage.java @@ -55,4 +55,4 @@ public class Enchantment_EnderDamage extends EnchantmentDamage { public String getName() { return "enchantment.damage.endermen"; } -}
\ No newline at end of file +} diff --git a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java index bf4cd1347c..cc09b5768e 100644 --- a/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java +++ b/src/main/java/gregtech/api/enchants/Enchantment_Radioactivity.java @@ -58,4 +58,4 @@ public class Enchantment_Radioactivity extends EnchantmentDamage { public String getName() { return "enchantment.damage.radioactivity"; } -}
\ No newline at end of file +} |