Ben Spiers
|
b62c5c8a3a
|
Get basic functionality working for the Laser Amplifier. No mode changing yet, and using the laser model in lieu of the actual one.
|
2014-07-30 22:26:03 +01:00 |
|
Ben Spiers
|
9413950842
|
Merge branch 'development' into 1.8
|
2014-07-28 17:33:38 +01:00 |
|
Ben Spiers
|
c339ee7a18
|
Merge branch 'master' into development
|
2014-07-28 17:33:09 +01:00 |
|
Ben Spiers
|
c97464649d
|
Fix trying to use IC2 EnergyNet without IC2 installed. It would never work anyway.
|
2014-07-28 17:20:31 +01:00 |
|
Ben Spiers
|
1d52a4f5a0
|
Add a Creative Energy Cube that's always half-full so it can sink or provide arbitrary amounts of energy.
|
2014-07-28 17:18:33 +01:00 |
|
Ben Spiers
|
cf4df0941b
|
Fix a crash casting null to float
|
2014-07-28 15:05:53 +01:00 |
|
Aidan Brady
|
9696ad246c
|
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
|
2014-07-28 09:27:16 -04:00 |
|
Aidan Brady
|
1ad7fe81b9
|
Salination Plant now auto-forms
|
2014-07-28 09:27:08 -04:00 |
|
Ben Spiers
|
e004fdca98
|
Merge branch 'development' into 1.8
Conflicts:
src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java
|
2014-07-27 20:53:00 +01:00 |
|
Ben Spiers
|
d0d660b9d4
|
Merge branch 'master' into development
|
2014-07-27 20:45:53 +01:00 |
|
Ben Spiers
|
1d61c3d4e8
|
Tweak energynet logic a bit to safeguard against overly high tiers of IC2 acceptor and things that implement everything but with only one working.
Should fix AE2 EU P2P tunnel support.
|
2014-07-27 20:45:13 +01:00 |
|
Aidan C. Brady
|
ce5bddbdd1
|
Merge branch 'development' into 1.8
Conflicts:
src/main/java/mekanism/common/block/BlockMachine.java
src/main/java/mekanism/common/item/ItemBlockMachine.java
src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
src/main/java/mekanism/common/tile/TileEntityPRC.java
|
2014-07-26 18:57:18 -04:00 |
|
Aidan C. Brady
|
ab34edc46a
|
Finished off new system of sustained data
|
2014-07-26 18:44:24 -04:00 |
|
Aidan C. Brady
|
94c3a6aa60
|
Started work on a new system of managing sustained data
|
2014-07-26 18:16:00 -04:00 |
|
Aidan C. Brady
|
7ac7fbc5cc
|
Sustained gas and fluid support for Chemical Washer, Chemical Crystallizer and Chemical Infuser
|
2014-07-26 17:59:43 -04:00 |
|
Aidan C. Brady
|
ba289ced25
|
Added sustained fluid and gas tanks to PRC and Electrolytic Separator, fixed Gas Generator losing energy when being picked up
|
2014-07-26 17:37:25 -04:00 |
|
Aidan C. Brady
|
aaffc3e364
|
Updated some imports and added textures
|
2014-07-26 16:45:48 -04:00 |
|
Aidan C. Brady
|
22b3097d15
|
Laser model! Also added some new Reactor Block assets.
|
2014-07-24 23:02:30 -04:00 |
|
Aidan C. Brady
|
5bee3991d8
|
Merge branch 'development' into 1.8
Conflicts:
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
|
2014-07-23 13:50:43 -04:00 |
|
Aidan C. Brady
|
bb8985b6f8
|
Fixed a few energy transfer issues
|
2014-07-23 13:49:42 -04:00 |
|
Aidan C. Brady
|
2b5bb53bc6
|
Fixed a few recipe issues
|
2014-07-23 13:43:12 -04:00 |
|
Aidan C. Brady
|
d8e94b00d2
|
Added effect information to upgrade GUI
|
2014-07-23 11:06:58 -04:00 |
|
Aidan C. Brady
|
52efdac614
|
Eliminated the deprecated "getSpeedMultiplier()" and "getEnergyMultiplier()" methods
|
2014-07-23 10:17:03 -04:00 |
|
Aidan C. Brady
|
523ec21467
|
Added button to remove upgrade, fixed font size. Almost done!
|
2014-07-22 22:16:20 -04:00 |
|
Aidan C. Brady
|
790cd33f2d
|
Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8
|
2014-07-22 20:37:59 -04:00 |
|
Aidan C. Brady
|
6470f69569
|
A big load of work on the new upgrade GUI
|
2014-07-22 20:37:53 -04:00 |
|
Ben Spiers
|
84daf186ca
|
More Reactor GUI work
|
2014-07-23 01:25:10 +01:00 |
|
Ben Spiers
|
775ba68482
|
Tweaking of lasers for packet-efficiency
|
2014-07-22 22:34:19 +01:00 |
|
Ben Spiers
|
c66676dd55
|
Fix some Server-side packets being sent by the client
|
2014-07-22 21:13:01 +01:00 |
|
Ben Spiers
|
327389a88c
|
Get Lasers kind of working vs. dediservers
|
2014-07-22 21:11:43 +01:00 |
|
Ben Spiers
|
dd421f7308
|
This should stop the servercrashing issue
|
2014-07-22 18:03:34 +01:00 |
|
Ben Spiers
|
a2bb224bf5
|
Fix transmitter render pass to stop things occluding incorrectly, make lasers get stronger and weaker as they start and stop
|
2014-07-22 17:41:34 +01:00 |
|
Aidan C. Brady
|
99482d8fd0
|
Fixed a minor issue
|
2014-07-21 22:24:27 -04:00 |
|
Aidan C. Brady
|
25cf5236ea
|
A few fixes
|
2014-07-21 21:33:43 -04:00 |
|
Aidan C. Brady
|
076c5f7377
|
More work!
|
2014-07-21 21:21:53 -04:00 |
|
Aidan C. Brady
|
2523d2fd6b
|
Did some work on actual upgrade system
|
2014-07-21 20:46:35 -04:00 |
|
Aidan C. Brady
|
0b8ec37164
|
More work on upgrade GUI, also made SimpleGui packets send new window ID to client
|
2014-07-21 19:15:27 -04:00 |
|
Aidan C. Brady
|
e778449045
|
More work! Finished off the upgrade tab and removed upgrade slot from all upgrade-wielding containers.
|
2014-07-21 18:07:15 -04:00 |
|
Aidan C. Brady
|
48183f6670
|
Work on the new upgrade system, specifically with GUI changes
|
2014-07-21 17:47:29 -04:00 |
|
Aidan C. Brady
|
f2441a1ebd
|
Merge branch 'development' into 1.8
Conflicts:
src/main/java/mekanism/common/recipe/BinRecipe.java
src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
|
2014-07-21 17:02:06 -04:00 |
|
Aidan C. Brady
|
0864e1061a
|
Merge a few more fixes
|
2014-07-21 16:45:08 -04:00 |
|
Aidan C. Brady
|
27056da3e4
|
Merge back a few bug fixes
|
2014-07-21 16:41:27 -04:00 |
|
Aidan C. Brady
|
4fcd3b47c5
|
Fix a few little bugs
|
2014-07-21 16:34:31 -04:00 |
|
Aidan C. Brady
|
d16483f4b1
|
Started work on the new upgrade system, as well as the new GUI
|
2014-07-21 14:57:31 -04:00 |
|
Aidan C. Brady
|
0416e2e904
|
Finished Digital Miner visual render functionality, also fixed a few issues with gas tanks
|
2014-07-21 13:30:39 -04:00 |
|
Aidan C. Brady
|
69a411813e
|
Started work on a Digital Miner visual render thing. For some reason it's culling all oceans.
|
2014-07-21 01:10:53 -04:00 |
|
Aidan C. Brady
|
7e525e10c6
|
Fixed a few recipes, also started work on Digital Miner visual
|
2014-07-20 23:29:35 -04:00 |
|
Aidan C. Brady
|
c1b317dcde
|
Added in warning for missing stacks. Onto visual Digital Miner range rendering!
|
2014-07-20 21:20:45 -04:00 |
|
Aidan C. Brady
|
2b817e28cd
|
Fixed an issue with Bins, also fixed a small GUI issue with the new filter system
|
2014-07-20 20:30:35 -04:00 |
|
Aidan C. Brady
|
de86e0b2a2
|
Finished off the filtering system! Also added new "fuzzy mode" to ItemStack filters in order to ignore metadata checks.
|
2014-07-20 20:19:01 -04:00 |
|