aidancbrady
aa52a53537
Merge branch '1.9.4' into 1.10
...
* 1.9.4:
Completed Opaque Transmitter implementation. Yay!
Fix Reactor Ports, again
Bump up Electrolytic Separator gas output
Fixed Reactor Port crash
compleatly replaced files
removed the word "opaque" in all image names
added boolean opaque
added boolean opaque
loaded config before Tier.init()
added new opaque images
2016-07-19 15:19:37 -04:00
aidancbrady
51342603d4
Merge branch 'development' into 1.9.4
...
* development:
Completed Opaque Transmitter implementation. Yay!
Fix Reactor Ports, again
Bump up Electrolytic Separator gas output
Fixed Reactor Port crash
compleatly replaced files
removed the word "opaque" in all image names
added boolean opaque
added boolean opaque
loaded config before Tier.init()
added new opaque images
Conflicts:
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/multipart/PartMechanicalPipe.java
src/main/java/mekanism/common/multipart/PartPressurizedTube.java
src/main/java/mekanism/common/multipart/PartThermodynamicConductor.java
src/main/java/mekanism/common/multipart/PartUniversalCable.java
src/main/java/mekanism/common/multipart/TransmitterIcons.java
src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
2016-07-19 15:19:04 -04:00
aidancbrady
0ae477fd01
Completed Opaque Transmitter implementation. Yay!
2016-07-19 14:03:11 -04:00
Aidan
640de3ef4c
Merge pull request #3493 from chaos234/opaque
...
Opaque
2016-07-19 13:41:53 -04:00
aidancbrady
ceb1c37b00
Fix Reactor Ports, again
2016-07-19 13:35:48 -04:00
aidancbrady
6aa6591628
Bump up Electrolytic Separator gas output
2016-07-19 13:31:52 -04:00
aidancbrady
c4ee63081f
Fixed Reactor Port crash
2016-07-19 13:16:37 -04:00
aidancbrady
e326502115
Merge branch '1.9.4' into 1.10
...
* 1.9.4:
Updated Digital Miner textures
A few minor fixes, added Ultimate Tier Installer texture
New textures, round 1.
2016-07-18 16:08:29 -04:00
aidancbrady
4937f66a19
Merge branch 'development' into 1.9.4
...
* development:
Updated Digital Miner textures
2016-07-18 16:08:08 -04:00
aidancbrady
903d1c95a4
Updated Digital Miner textures
2016-07-18 16:07:53 -04:00
aidancbrady
90a587383e
Merge branch 'development' into 1.9.4
...
* development:
A few minor fixes, added Ultimate Tier Installer texture
New textures, round 1.
Conflicts:
src/main/java/mekanism/generators/common/MekanismGenerators.java
src/main/java/mekanism/generators/common/block/BlockGenerator.java
2016-07-18 15:56:27 -04:00
aidancbrady
38024f98ad
A few minor fixes, added Ultimate Tier Installer texture
2016-07-18 15:17:47 -04:00
aidancbrady
71fbf0a2bd
New textures, round 1.
2016-07-17 21:14:47 -04:00
Marcel Petzold
e1a0965f66
added boolean opaque
2016-07-16 20:03:31 +02:00
Marcel Petzold
955ed3e125
added boolean opaque
2016-07-16 20:03:12 +02:00
Marcel Petzold
a25217aab1
loaded config before Tier.init()
2016-07-16 20:02:41 +02:00
aidancbrady
32241b9121
Merge branch '1.9.4' into 1.10
...
* 1.9.4:
Better Structural Glass recipe
Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator
2016-07-16 12:27:13 -04:00
aidancbrady
6e0a63c3ee
Merge branch 'development' into 1.9.4
...
* development:
Better Structural Glass recipe
Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator
Conflicts:
src/main/java/mekanism/common/Mekanism.java
src/main/java/mekanism/common/network/PacketPortableTeleporter.java
src/main/java/mekanism/common/tile/TileEntityFactory.java
src/main/java/mekanism/common/tile/TileEntitySolarNeutronActivator.java
2016-07-16 12:26:58 -04:00
aidancbrady
1d51dd34dc
Better Structural Glass recipe
2016-07-16 12:20:56 -04:00
aidancbrady
88ead85f0e
Fixed Portable Teleporter issue, fixed compounded Factory localization, add upgrades support to Solar Neutron Activator
2016-07-16 12:16:55 -04:00
aidancbrady
c3aef035bb
Merge branch '1.9.4' into 1.10
...
* 1.9.4:
Fixed side output issue
2016-07-15 15:13:44 -04:00
aidancbrady
ecba0eaa87
Merge branch 'development' into 1.9.4
...
* development:
Fixed side output issue
Conflicts:
src/main/java/mekanism/common/tile/component/TileComponentEjector.java
2016-07-15 15:13:28 -04:00
aidancbrady
ca52ba521b
Fixed side output issue
2016-07-15 00:06:15 -04:00
aidancbrady
931615443c
Merge branch '1.9.4' into 1.10
...
* 1.9.4:
Fixed balloons!
2016-07-14 11:36:07 -04:00
aidancbrady
1d2d1b9e98
Fixed balloons!
2016-07-14 11:35:39 -04:00
aidancbrady
c703ddf956
Official 1.10 port
...
- updated IC2 API
2016-07-14 02:24:31 -04:00
aidancbrady
26ae2c8de3
Merge branch 'development' into 1.9.4
...
* development:
Fixed texture registration issue
Fixed Logistical Transporter network pathfinding
Fixed Digital Miner and Logistical Sorter interfaces
Conflicts:
src/main/java/mekanism/common/item/ItemTierInstaller.java
src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java
src/main/java/mekanism/common/util/TransporterUtils.java
2016-07-13 17:32:16 -04:00
aidancbrady
e4eb04ea13
Fixed texture registration issue
2016-07-13 17:19:23 -04:00
aidancbrady
773d53e93a
Fixed Logistical Transporter network pathfinding
2016-07-13 17:07:02 -04:00
aidancbrady
61906fc309
Fixed Digital Miner and Logistical Sorter interfaces
2016-07-13 00:24:45 -04:00
aidancbrady
c7d68e384d
Merge branch 'development' into 1.9.4
...
* development:
Allow wildcards in transporter oredict filters again
2016-07-12 23:05:48 -04:00
aidancbrady
6897b9a3ba
Allow wildcards in transporter oredict filters again
2016-07-12 23:05:36 -04:00
aidancbrady
cb6682266d
Completely transition everything to use new fluid system, including Forge's UniversalBucket. No more old references!
2016-07-12 17:35:24 -04:00
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