Anvilcraft/atomicscience
2
1
Fork 0
generated from tilera/1710mod
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: Anvilcraft:3bd02d72213b3089fb02bb62c25e44f87a93ddb8
Branches Tags
Anvilcraft:master
Anvilcraft:v1.1.3
Anvilcraft:v1.1.2
Anvilcraft:v1.1.1
Anvilcraft:v1.1.0
Anvilcraft:v1.0.1
...
compare: Anvilcraft:5aa837d1ef9f3d80c4fc60907fa0052321ee7bd7
Branches Tags
Anvilcraft:master
Anvilcraft:v1.1.3
Anvilcraft:v1.1.2
Anvilcraft:v1.1.1
Anvilcraft:v1.1.0
Anvilcraft:v1.0.1

5 commits
3bd02d7221 ... 5aa837d1ef

Author SHA1 Message Date
Timo Ley 5aa837d1ef chore: bump version
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details
2023-02-04 19:09:48 +01:00
Timo Ley ef42bb58c9 Merge branch 'master' of ssh://git.tilera.org:2222/Anvilcraft/atomicscience 2023-02-04 19:09:09 +01:00
Timo Ley ca5cd6b6a5 chore: bump version 2023-02-04 19:07:48 +01:00
Timo Ley 0ee77f4ba6 fix: breeder fuel recipe 2023-02-04 18:45:19 +01:00
Timo Ley 7fbe50f194 fix: nuclear boiler container 2023-02-04 18:29:05 +01:00
3 changed files with 3 additions and 3 deletions
Show stats Expand all files Collapse all files

2
build.gradle
View file

@ -23,7 +23,7 @@ apply plugin: 'maven-publish'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
version = "1.1.2"
version = "1.1.3"
group = "universalelectricity"
archivesBaseName = "atomicscience"

2
src/main/java/atomicscience/AtomicScience.java
View file

@ -369,7 +369,7 @@ public class AtomicScience {
AtomicScience.CONFIGURATION.save();
MinecraftForge.EVENT_BUS.register(itCellAntimatter);
MinecraftForge.EVENT_BUS.register(FulminationEventHandler.INSTANCE);
OreDictionary.registerOre("breederUranium", itUranium);
OreDictionary.registerOre("breederUranium", new ItemStack(itUranium, 1, 1));
OreDictionary.registerOre("blockRadioactive", blockRadioactive);
OreDictionary.registerOre("cellEmpty", itCell);
OreDictionary.registerOre("cellUranium", itCellUranium);

2
src/main/java/atomicscience/hecheng/CNuclearBoiler.java
View file

@ -79,7 +79,7 @@ public class CNuclearBoiler extends Container {
if (!this.mergeItemStack(itemStack, 0, 1, false)) {
return null;
}
} else if (FluidContainerRegistry.isContainer(itemStack) &&
} else if (FluidContainerRegistry.isContainer(itemStack) && FluidContainerRegistry.getFluidForFilledItem(itemStack) != null &&
FluidRegistry.WATER ==
FluidContainerRegistry.getFluidForFilledItem(itemStack)
.getFluid()) {