Skip to content

Commit

Permalink
Merge remote-tracking branch 'pashabou/master' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	dependencies.gradle
  • Loading branch information
Dream-Master committed Jul 25, 2024
2 parents d26e3cf + 12b3381 commit 7c5497d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-415-GTNH:dev")
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-414-GTNH-pre:dev")
implementation("com.github.GTNewHorizons:Baubles:1.0.4:dev")
compileOnly("curse.maven:cofh-core-69162:2388751")
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.6.14-GTNH:dev")
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.5.25-GTNH:dev")
compileOnly("com.github.GTNewHorizons:MouseTweaks:2.4.17-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:EnderIO:2.7.1:dev") { transitive = false }
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public void serverPacketData(final INetworkInfo manager, final WCTPacket packet,

if (player.openContainer instanceof ContainerCraftConfirm) {
final ContainerCraftConfirm ccc = (ContainerCraftConfirm) player.openContainer;
ccc.setItemToCraft(cca.getItemToCraft());
ccc.setAutoStart(this.heldShift);
ccc.setJob(futureJob);
cca.detectAndSendChanges();
Expand Down

0 comments on commit 7c5497d

Please sign in to comment.