fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'TheAirBlow/AE2-Omnifactory' into AE2-Omnifactory

Browse Source
This commit is contained in:
PrototypeTrousers
2022-11-20 14:04:46 -03:00
parent c5607bda4e 7748f7c92d
commit d6650f9617
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle.properties
-2
View File
@@ -24,8 +24,6 @@ ic2_version=2.8.73-ex112
top_version=1.12-1.4.23-16 top_version=1.12-1.4.23-16
cofhcore_version=1.12.2-4.5.2.19 cofhcore_version=1.12.2-4.5.2.19
crafttweaker_version=4.1.8.9 crafttweaker_version=4.1.8.9
inventorytweaks_version=1.63
bogosorter_version=1.1.0
ctm_version=MC1.12.2-0.3.1.16 ctm_version=MC1.12.2-0.3.1.16
forestry_version=5.8.2.387 forestry_version=5.8.2.387
######################################################### #########################################################
gradle/scripts/dependencies.gradle
+4 -3
View File
@@ -23,10 +23,12 @@ repositories {
url "https://cursemaven.com" url "https://cursemaven.com"
} }
/*
maven { maven {
name = "CurseForge" name = "CurseForge"
url = "https://minecraft.curseforge.com/api/maven/" url = "https://minecraft.curseforge.com/api/maven/"
} }
*/
maven { maven {
name "Mobius" name "Mobius"
@@ -102,13 +104,12 @@ dependencies {
compileOnly "mcjty.theoneprobe:TheOneProbe-1.12:${top_version}:api" compileOnly "mcjty.theoneprobe:TheOneProbe-1.12:${top_version}:api"
compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf" compileOnly "cofh:CoFHCore:${cofhcore_version}:deobf"
compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}" compileOnly "CraftTweaker2:CraftTweaker2-API:${crafttweaker_version}"
compileOnly "inventory-tweaks:InventoryTweaks:${inventorytweaks_version}:api" compileOnly "curse.maven:inventory-tweaks-223094:2482482"
compileOnly "inventory-bogo-sorter:bogosorter:${bogosorter_version}" compileOnly "curse.maven:inventory-bogo-sorter-632327:3975184"
compileOnly "team.chisel.ctm:CTM:${ctm_version}" compileOnly "team.chisel.ctm:CTM:${ctm_version}"
compileOnly "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16:api" compileOnly "de.ellpeck.actuallyadditions:ActuallyAdditions:1.12.2-r152.16:api"
deobfCompile "net.sengir.forestry:forestry_${minecraft_version}:$forestry_version" deobfCompile "net.sengir.forestry:forestry_${minecraft_version}:$forestry_version"
// at runtime, use the full JEI jar // at runtime, use the full JEI jar
runtime "mezz.jei:jei_${minecraft_version}:${jei_version}" runtime "mezz.jei:jei_${minecraft_version}:${jei_version}"
src/main/java/appeng/container/slot/AppEngSlot.java
+1 -1
View File
@@ -136,7 +136,7 @@ public class AppEngSlot extends Slot {
@Override @Override
public void onSlotChanged() { public void onSlotChanged() {
this.setIsValid(hasCalculatedValidness.NotAvailable); this.setIsValid(hasCalculatedValidness.NotAvailable);
if (this.isSlotEnabled()) { if (this.isSlotEnabled() && this.itemHandler != null) {
ItemHandlerUtil.setStackInSlot(this.itemHandler, this.index, this.getStack().copy()); ItemHandlerUtil.setStackInSlot(this.itemHandler, this.index, this.getStack().copy());
if (this.getContainer() != null) { if (this.getContainer() != null) {