aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorNxer <306803661@qq.com>2023-09-27 18:27:11 +0800
committerNxer <306803661@qq.com>2023-09-27 18:27:11 +0800
commite06dea6c337f181ed86065fa6214fa9ab5e79793 (patch)
tree0f216f3321d968182a35e98ac77ec2d0f192ecdc /src/main/java
parent39b7f117f1131a2454acc00846b21fbc6250b3f6 (diff)
downloadGT5-Unofficial-e06dea6c337f181ed86065fa6214fa9ab5e79793.tar.gz
GT5-Unofficial-e06dea6c337f181ed86065fa6214fa9ab5e79793.tar.bz2
GT5-Unofficial-e06dea6c337f181ed86065fa6214fa9ab5e79793.zip
fix ID conflict
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
index fd5a37432b..27e07cce92 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -16,8 +16,8 @@ public class WerkstoffMaterialPool implements Runnable {
private static final int offsetID = 11_000;
private static final int offsetID2 = 11_100;
private static final int offsetID3 = 11_300;
- private static final int offsetID4 = 11_400;
- private static final int offsetID5 = 11_500;
+ private static final int offsetID4 = 12_000;
+ private static final int offsetID5 = 12_100; // 11500 has been used in GalaxySpace
/*
* public static final Werkstoff __ = new Werkstoff( new short[] {_, _, _}, "__", new Werkstoff.Stats(),