aidancbrady
6c8e932340
Fixed EnergyAcceptorWrapper crash
2016-08-03 19:39:39 -05:00
aidancbrady
cf9c9d0d50
Fixed Atomic Disassembler attack speed
2016-08-03 19:36:43 -05:00
aidancbrady
4a07cf961e
Fixed CME when checking recipes
2016-08-03 19:26:51 -05:00
aidancbrady
ff33572ff0
Fixed Digital Miner text scaling, fixed MCMP version, fixed Digital Miner crash
2016-08-03 19:19:52 -05:00
aidancbrady
38999f3647
Better Creative Energy Cube config
2016-07-28 12:36:15 -04:00
aidancbrady
1355bd11cd
Added a NONE TransformType check
2016-07-25 18:55:54 -04:00
aidancbrady
27f0d9ce11
Add proper crash check
2016-07-23 23:35:59 -04:00
aidancbrady
62c0588722
Restrict Thermal Evaporation Plant output to needed
2016-07-23 23:11:32 -04:00
aidancbrady
b62a858a4a
Fix rendering crashes
2016-07-23 22:56:50 -04:00
aidancbrady
dce74d4459
Fixed Precision Sawmill duplication
2016-07-20 23:47:51 -04:00
aidancbrady
7b38621f77
Fixed capes :)
2016-07-20 15:25:17 -04:00
aidancbrady
ba50a947cd
Vsync Wind Generators to client refresh rate
2016-07-20 15:04:27 -04:00
aidancbrady
95028f5732
Check with security before using Configuration Card
2016-07-20 14:44:44 -04:00
aidancbrady
e8513f4dca
Fixed bounding block placement, fixed texture registration
2016-07-20 14:42:21 -04:00
aidancbrady
a0d2d2f505
Fixed pipe crash, fixed Logistical Sorter render
2016-07-20 14:32:33 -04:00
aidancbrady
fc1ff9e8f5
Merge branch '1.9.4' into 1.10
...
* 1.9.4:
Removed println
Wind Generators are now much more efficient
2016-07-19 15:53:07 -04:00
aidancbrady
ceab621852
Merge branch '1.7.10' into 1.9.4
...
* 1.7.10:
Removed println
Wind Generators are now much more efficient
Conflicts:
src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java
src/main/java/mekanism/generators/client/render/RenderWindGenerator.java
2016-07-19 15:52:34 -04:00
aidancbrady
bc0bd80302
Removed println
2016-07-19 15:46:51 -04:00
aidancbrady
a59ba334ba
Wind Generators are now much more efficient
2016-07-19 15:43:09 -04:00
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