TheBrokenRail/EnergonRelics
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Compare commits

base: TheBrokenRail:1740c58262568dec01f34dc9e932b2d7259bbd0e
Branches Tags
TheBrokenRail:master
TheBrokenRail:1.0.4+1.16.2
TheBrokenRail:1.0.3+1.16.2
TheBrokenRail:1.0.2+1.16.2
TheBrokenRail:1.0.1+1.16.2
TheBrokenRail:1.0.0+1.16.2
TheBrokenRail:0.2.2+1.16.2
TheBrokenRail:0.2.1+1.16.2
TheBrokenRail:0.2.0+1.16.2
TheBrokenRail:0.1.9+1.16.2
TheBrokenRail:0.1.8+1.16.2
TheBrokenRail:0.1.7+1.16.2
TheBrokenRail:0.1.6+1.16.2
TheBrokenRail:0.1.5+1.16.2
TheBrokenRail:0.1.4+1.16.2
TheBrokenRail:0.1.3+1.16.2
TheBrokenRail:0.1.2+1.16.2
TheBrokenRail:0.1.1+1.16.2
TheBrokenRail:0.1.0+1.16.2
TheBrokenRail:0.0.9+1.16.2
TheBrokenRail:0.0.8+1.16.2
TheBrokenRail:0.0.7+1.16.2
TheBrokenRail:0.0.6+1.16.2
TheBrokenRail:0.0.5+1.16.2
TheBrokenRail:0.0.5+1.16.2-rc1
TheBrokenRail:0.0.4+1.16.2-rc1
TheBrokenRail:0.0.3+1.16.2-pre3
TheBrokenRail:0.0.2+1.16.2-pre3
TheBrokenRail:0.0.2+1.16.2-pre2
TheBrokenRail:0.0.1+1.16.2-pre2
..
compare: TheBrokenRail:e98b44453db00e38c4430b53a11e80dd84d0c6e1
Branches Tags
TheBrokenRail:master
TheBrokenRail:1.0.4+1.16.2
TheBrokenRail:1.0.3+1.16.2
TheBrokenRail:1.0.2+1.16.2
TheBrokenRail:1.0.1+1.16.2
TheBrokenRail:1.0.0+1.16.2
TheBrokenRail:0.2.2+1.16.2
TheBrokenRail:0.2.1+1.16.2
TheBrokenRail:0.2.0+1.16.2
TheBrokenRail:0.1.9+1.16.2
TheBrokenRail:0.1.8+1.16.2
TheBrokenRail:0.1.7+1.16.2
TheBrokenRail:0.1.6+1.16.2
TheBrokenRail:0.1.5+1.16.2
TheBrokenRail:0.1.4+1.16.2
TheBrokenRail:0.1.3+1.16.2
TheBrokenRail:0.1.2+1.16.2
TheBrokenRail:0.1.1+1.16.2
TheBrokenRail:0.1.0+1.16.2
TheBrokenRail:0.0.9+1.16.2
TheBrokenRail:0.0.8+1.16.2
TheBrokenRail:0.0.7+1.16.2
TheBrokenRail:0.0.6+1.16.2
TheBrokenRail:0.0.5+1.16.2
TheBrokenRail:0.0.5+1.16.2-rc1
TheBrokenRail:0.0.4+1.16.2-rc1
TheBrokenRail:0.0.3+1.16.2-pre3
TheBrokenRail:0.0.2+1.16.2-pre3
TheBrokenRail:0.0.2+1.16.2-pre2
TheBrokenRail:0.0.1+1.16.2-pre2

No commits in common. "1740c58262568dec01f34dc9e932b2d7259bbd0e" and "e98b44453db00e38c4430b53a11e80dd84d0c6e1" have entirely different histories.
1740c58262 ... e98b44453d

2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserBlockEntity.java
View File

@ -54,7 +54,7 @@ public class IndustrialLaserBlockEntity extends FieldProjectorBlockEntity {
} else { } else {
Vec3d vec = Vec3d.ofCenter(targetPos); Vec3d vec = Vec3d.ofCenter(targetPos);
((ServerWorld) getWorld()).spawnParticles(ParticleTypes.FLAME, vec.getX(), vec.getY(), vec.getZ(), 1, 0.3f, 0.3f, 0.3f, 0f); ((ServerWorld) getWorld()).spawnParticles(ParticleTypes.FLAME, vec.getX(), vec.getY(), vec.getZ(), 1, 0.4f, 0.4f, 0.4f, 0f);
progress++; progress++;
} }

2
src/main/java/com/thebrokenrail/energonrelics/config/HardcodedConfig.java
View File

@ -36,7 +36,7 @@ public class HardcodedConfig {
public static final float INDUSTRIAL_LASER_BEAM_DAMAGE = 1f; public static final float INDUSTRIAL_LASER_BEAM_DAMAGE = 1f;
public static final long INDUSTRIAL_LASER_ENERGY_REQUIRED = 58; public static final long INDUSTRIAL_LASER_ENERGY_REQUIRED = 58;
public static final int INDUSTRIAL_LASER_BEAM_TIME = 148; public static final int INDUSTRIAL_LASER_BEAM_TIME = 126;
public static final int INDUSTRIAL_LASER_MIN_INGOTS_FROM_ORE = 1; public static final int INDUSTRIAL_LASER_MIN_INGOTS_FROM_ORE = 1;
public static final int INDUSTRIAL_LASER_MAX_INGOTS_FROM_ORE = 3; public static final int INDUSTRIAL_LASER_MAX_INGOTS_FROM_ORE = 3;
public static final int INDUSTRIAL_LASER_INGOTS_FROM_STORAGE = 9; public static final int INDUSTRIAL_LASER_INGOTS_FROM_STORAGE = 9;