Age | Commit message (Collapse) | Author |
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
|
|
|
|
par2 Might be negative under certain circumstance, causing the mContent counter to be temporarily negative.
|
|
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
|
|
Improvements to Vanilla Replacement & GT_Utility#copy
|
|
Extended GUI fluid manipulation support to GT_MetaTileEntity_BasicTank
|
|
#copyOrNull variant with single parameter.
|
|
|
|
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
|
|
|
|
- Add glow support for all sides and states of iconset machines (same as with basicmachines).
Automated code cleanup with IDEA of:
- Optiimise all imports (remove unused, sort)
- Reorder all modifiers to the canonical preferred order (as stated in the Java Language Specification)
- Add all missing @Override annotations
|
|
git and diff tools will complain if text file does not end with a newline.
Fixed all text files in the repository with Linux bash shell:
```sh
git ls-files -z |
while IFS= read -rd '' f; do
mime="$(file --brief --mime "$f")";
if [ -z "${mime##text/*}" ]; then
tail -c1 "$f" |
read -r _ || printf '\n' >>"$f";
fi;
done
```
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
Fix bottled water filling
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
Left click to do as many manipulation as possible.
Right click to just manipulate once.
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
|
|
|
|
|
|
|
|
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
|
|
coremod to enable disable.
|
|
|
|
|
|
0.75 or normal durability in loose fitting mode.
|
|
11213d18d7345ee29f2efce6c5d421a855bed056
fb163d1be0aa291508bb6513e34cacba3ca06b36
fb508132d91543d5e837dfa4fac09cf5e4b9e7a8
d682ca0d36e3824b1bf73cc800f58c4126bcf104
0f2db4f76a88c26ca08b2da444b264444ce01316
50229e4506687d184c93ed702cdeeecea65e326a
f5195f822d9951015c4ef6599e5b4f6544ec0714
fbdb6ceecf60183ab382f043b78b61941157eccf
55af1972b86a82bf6038342aa1a3bf9013d0f164
c0d9d5a268da4b58385ee95e27408e06829c74b8
416890142c0fa62617fc6e4537826689635e9eb3
d532cb67f7bc68243e3d2dc2a12a466ed9c9e2d9
d1671eaf33b3b4223da174e115f35b9bc1f19c5a
4d90afad87375e3f1013a493f4b3b5d4e92bf521
3c397d61697c13f0467e0cb67fb127fff8401f71
64957ccd0f51ef283cc561d52a5439c3752c4e71
b7e0863207253ee758742a22c607c3ccc37af6d3
ae5a1e117d47876de9d2d2e8ea581e15686c5e1a
a0eb30d03f8fc311598f628ad45b5365c7391917
505a9c263e88e5519bade6a3167f829e41e13e64
9cbb9c66a2f63e7e0cb4aceebfc9c93776b82be2
Drillers upgrade #1163
https://github.com/Blood-Asp/GT5-Unofficial/pull/1163
|
|
|
|
Assembly line upgrade #1130
@Antifluxfield can you review this changes. Thanks
|
|
# Conflicts:
# build.properties
# src/main/java/gregtech/api/enums/ItemList.java
# src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
# src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
# src/main/java/gregtech/common/GT_Proxy.java
# src/main/java/gregtech/common/GT_RecipeAdder.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
# src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
# src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png
# src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png
|
|
# Conflicts:
# build.properties
# src/main/java/gregtech/GT_Mod.java
# src/main/java/gregtech/api/enums/Textures.java
# src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
# src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
# src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
# src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
# src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
# src/main/java/gregtech/api/util/GT_Utility.java
# src/main/java/gregtech/common/GT_Client.java
# src/main/java/gregtech/common/GT_Pollution.java
# src/main/java/gregtech/common/GT_Proxy.java
# src/main/java/gregtech/common/GT_UndergroundOil.java
# src/main/java/gregtech/common/GT_Worldgenerator.java
# src/main/java/gregtech/common/blocks/GT_Block_Machines.java
# src/main/java/gregtech/common/blocks/GT_Material_Casings.java
# src/main/java/gregtech/common/covers/GT_Cover_Arm.java
# src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
# src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
# src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
# src/main/java/gregtech/common/covers/GT_Cover_Drain.java
# src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
# src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java
# src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
# src/main/java/gregtech/common/covers/GT_Cover_Pump.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
# src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
# src/main/java/gregtech/common/covers/GT_Cover_Vent.java
# src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
# src/main/java/gregtech/common/gui/GT_Container_Filter.java
# src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
# src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_None.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
# src/main/java/gregtech/loaders/load/GT_FuelLoader.java
# src/main/java/gregtech/loaders/misc/GT_CoverLoader.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
|
|
|