Skip to content
This repository has been archived by the owner on May 26, 2024. It is now read-only.

Dev #846

Merged
merged 3 commits into from
Mar 10, 2024
Merged

Dev #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a5724f
update
Dream-Master Mar 10, 2024
bd5d5a3
make it compatible with new GT version
Dream-Master Mar 10, 2024
a9eb52e
Spotless apply for branch dev for #846 (#847)
github-actions[bot] Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies {
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.86:dev')
api("com.github.GTNewHorizons:bartworks:0.9.14:dev")
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.95:dev')
api("com.github.GTNewHorizons:bartworks:0.9.17:dev")

implementation('curse.maven:cofh-core-69162:2388751')
// https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
Expand All @@ -14,5 +14,5 @@ dependencies {
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev') {transitive=false}

runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.8.5:dev') {transitive=false}
runtimeOnly('com.github.GTNewHorizons:ForestryMC:4.8.7:dev') {transitive=false}
}
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.15'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.16'
}


6 changes: 3 additions & 3 deletions src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta,
}
}

public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
RenderBlocks aRenderer) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);

Expand All @@ -249,7 +249,7 @@ public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, i
: false;
}

public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
RenderBlocks aRenderer, ITexture[][] aTextures) {
aBlock.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
aRenderer.setRenderBoundsFromBlock(aBlock);
Expand All @@ -262,7 +262,7 @@ public static boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, i
return true;
}

public static boolean renderPipeBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
public boolean renderPipeBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
IPipeRenderedTileEntity aTileEntity, RenderBlocks aRenderer) {
final int aConnections = aTileEntity.getConnections();
if ((aConnections & HAS_FOAM) != 0) {
Expand Down