aidancbrady
ca5047cbf3
Merge branch 'development' into 1.9.4
...
* development:
Better text field management
Conflicts:
src/main/java/mekanism/client/gui/GuiMekanism.java
src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java
src/main/java/mekanism/client/gui/GuiTeleporter.java
2016-07-10 13:59:20 -04:00
aidancbrady
ae77ce0e19
Better text field management
2016-07-10 13:53:13 -04:00
aidancbrady
4745a78ecc
Fixed Digital Miner breaking
2016-07-10 11:34:00 -04:00
aidancbrady
05dea8a5b6
Fixed custom item rotation, fixed recipes, fixed fluid container items
2016-07-08 23:49:13 -04:00
aidancbrady
b8dc6cc67d
Merge branch 'development' into 1.9.4
...
* development:
Fixed turbine crash
2016-07-07 00:34:35 -04:00
aidancbrady
9005e589e0
Fixed turbine crash
2016-07-07 00:32:47 -04:00
aidancbrady
f6d18af0e1
Fixed custom renders to ensure draw state remains the same
2016-07-06 18:56:13 -04:00
aidancbrady
7b48129909
Merge branch 'development' into 1.9.4
...
* development:
Add necessary networking to Reactor Port
Better tooltips
Actually fix tier installers
Add Silicon crusher recipe, fixed Tier Installers
Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin
Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines
Conflicts:
build.properties
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/MekanismItems.java
src/main/java/mekanism/common/item/ItemFactoryInstaller.java
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityBin.java
src/main/java/mekanism/common/tile/TileEntityElectricMachine.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/tile/TileEntityGasTank.java
src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java
src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
src/main/java/mekanism/generators/common/block/BlockReactor.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPort.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/ReactorPortInput.png
src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port-ctm.png
src/main/resources/assets/mekanism/textures/blocks/ctm/reactor_port.png
2016-07-06 18:38:29 -04:00
aidancbrady
5fa3308565
Add necessary networking to Reactor Port
2016-07-06 17:56:40 -04:00
aidancbrady
52daff9f67
Better tooltips
2016-07-06 17:53:14 -04:00
aidancbrady
42f27058c2
Actually fix tier installers
2016-07-06 17:36:29 -04:00
aidancbrady
7a117e20dc
Add Silicon crusher recipe, fixed Tier Installers
2016-07-06 17:34:29 -04:00
aidancbrady
28846dcb73
Rename Factory Installer to Tier Installer, add recipe for Saturating Condenser, add tier upgrade support for Energy Cube, Gas Tank, Fluid Tank and Bin
2016-07-06 17:21:24 -04:00
aidancbrady
95c0ad4a73
Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines
2016-07-06 16:56:24 -04:00
aidancbrady
0c4c7ce5f4
Rendering fixes, fixed Bin rotation, fixed placement of bounding block structures
2016-07-06 15:03:27 -04:00
aidancbrady
ea6ff2d72c
Fixed item render lighting
2016-07-06 12:36:58 -04:00
aidancbrady
3505d553d9
Merge branch 'development' into 1.9.4
...
* development:
Fixed Robit AI
Fixed Robit dupe glitch
Fixed the stupid invalid frequency issue
Conflicts:
src/main/java/mekanism/client/ClientProxy.java
src/main/java/mekanism/client/gui/GuiRobitCrafting.java
src/main/java/mekanism/client/gui/GuiRobitRepair.java
src/main/java/mekanism/common/CommonProxy.java
src/main/java/mekanism/common/RobitAIPickup.java
src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java
src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java
src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
2016-07-05 18:42:43 -04:00
aidancbrady
53a9204974
Fixed Robit AI
2016-07-05 18:23:22 -04:00
aidancbrady
cdf4b16ec1
Fixed Robit dupe glitch
2016-07-05 17:30:34 -04:00
aidancbrady
f4582dbccf
Fixed the stupid invalid frequency issue
2016-07-05 17:01:58 -04:00
aidancbrady
83ffb72f18
Fixed retrogen crash
2016-07-04 18:53:19 -04:00
aidancbrady
7b1da62553
Merge branch 'development' into 1.9.4
...
* development:
Update pt_PT and pt_BR
Creates pt_PT and updates pt_BR
Fixed break crash
Added configurable steam auto-output to Reactor Port
Conflicts:
src/main/java/mekanism/common/util/MekanismUtils.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
2016-07-04 18:49:07 -04:00
aidancbrady
fdc21d8de5
Fixed break crash
2016-07-03 02:07:14 -04:00
aidancbrady
330756e5a7
Added configurable steam auto-output to Reactor Port
2016-07-02 20:33:27 -04:00
aidancbrady
3992ead0ff
Abstract away cable IC2 integration. Hopefully this works
2016-07-02 17:23:34 -04:00
aidancbrady
fa45e1168c
Fix attempt
2016-07-02 16:54:50 -04:00
aidancbrady
8ef2f57c90
Re-add part of IC2 implementation. This crashing is weird
2016-07-02 16:39:33 -04:00
aidancbrady
dff99a764f
Ic2 support testing
2016-07-02 16:29:50 -04:00
aidancbrady
aa9b9fafb0
Fixed MCMultipart auto-download
2016-07-02 01:52:38 -04:00
aidancbrady
333cc7ff27
Completed Tesla support, using a handy new system of wrapper-abstracted item and tile capability handlers
2016-07-02 01:27:49 -04:00
aidancbrady
53353cd050
Fixed IC2 support (still may crash without), begin adding Tesla support
2016-07-01 11:05:02 -04:00
aidancbrady
b624309837
Merge branch 'development' into 1.9.4
...
* development:
Added Fluid Tank comparator support, fixed Gas Tank comparator support
Implement config option for operators to bypass security, added turbine dump/dump excess functionality
Fixed Tesseract and Flux Duct support
Updated IC2 API, fixed integration
Conflicts:
src/api/java/ic2/api/Direction.class
src/api/java/ic2/api/Direction.java
src/api/java/ic2/api/crops/CropCard.class
src/api/java/ic2/api/crops/CropCard.java
src/api/java/ic2/api/crops/ICropTile.class
src/api/java/ic2/api/crops/ICropTile.java
src/api/java/ic2/api/energy/prefab/BasicSink.class
src/api/java/ic2/api/energy/prefab/BasicSource.class
src/api/java/ic2/api/info/Info.class
src/api/java/ic2/api/item/IC2Items.class
src/api/java/ic2/api/item/ILatheItem.class
src/api/java/ic2/api/item/ILatheItem.java
src/api/java/ic2/api/network/NetworkHelper.class
src/api/java/ic2/api/network/NetworkHelper.java
src/api/java/ic2/api/recipe/RecipeInputFluidContainer.class
src/api/java/ic2/api/recipe/RecipeInputOreDict.class
src/api/java/ic2/api/recipe/Recipes.class
src/api/java/ic2/api/recipe/Recipes.java
src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/tile/TileEntityFluidTank.java
src/main/java/mekanism/common/util/SecurityUtils.java
src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java
2016-06-30 12:56:45 -04:00
aidancbrady
41ea222aab
Added Fluid Tank comparator support, fixed Gas Tank comparator support
2016-06-30 12:45:15 -04:00
aidancbrady
3b214376ba
Implement config option for operators to bypass security, added turbine dump/dump excess functionality
2016-06-30 12:25:20 -04:00
aidancbrady
8f8f1751ec
Fixed Tesseract and Flux Duct support
2016-06-30 11:14:21 -04:00
aidancbrady
0b9a71162a
Updated IC2 API, fixed integration
2016-06-30 11:07:52 -04:00
aidancbrady
202f917345
Begin porting fluid items
2016-06-30 10:41:55 -04:00
aidancbrady
cbf109fe55
Merge branch 'development' into 1.9.4
...
* development:
Revert "Remove deprecated gas API methods"
Reactor Ports now auto-eject steam
Remove deprecated gas API methods
Conflicts:
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
2016-06-30 01:11:44 -04:00
aidancbrady
b77ca6ff0c
Revert "Remove deprecated gas API methods"
...
This reverts commit c5a414df37 .
2016-06-30 01:03:13 -04:00
aidancbrady
425b43a4c4
Reactor Ports now auto-eject steam
2016-06-30 00:46:02 -04:00
aidancbrady
c5a414df37
Remove deprecated gas API methods
2016-06-29 19:58:13 -04:00
aidancbrady
ea544ff3ac
Fixed fluids. Yay! Still need to update Reactor Port and item handling
2016-06-29 19:50:52 -04:00
aidancbrady
08700a82e7
Improved fluid handling
2016-06-29 12:26:34 -04:00
Ben Spiers
b8f3a3e0b2
Prevent Mechanical pipes from crashing on placement
2016-06-29 03:50:59 +01:00
aidancbrady
6086bc9f53
Begin transitioning to new fluid system, doesn't exactly work yet
2016-06-27 19:56:53 -04:00
aidancbrady
d70efc5cc7
Fixed Digital Miner
2016-06-26 16:11:20 -04:00
aidancbrady
24377545ba
Merge branch 'development' into 1.9.4
...
* development:
Fixed heat displays
2016-06-26 15:51:09 -04:00
aidancbrady
8a166e108a
Fixed heat displays
2016-06-26 15:48:47 -04:00
aidancbrady
82b42282e6
Fixed Chargepad render
2016-06-26 15:41:58 -04:00
aidancbrady
e6da7fdc9c
Update to latest Forge, use Capability standards. Need to port to new fluid system
2016-06-23 16:34:27 -04:00