EzerArch
|
a14864aea5
|
Merge pull request #2 from aidancbrady/master
Sync with trunk
|
2016-03-20 20:06:29 -03:00 |
|
aidancbrady
|
1b2aee283e
|
Work on security framework
|
2016-03-19 22:03:17 -04:00 |
|
aidancbrady
|
e53c00d2b8
|
Fixed reactors shutting off when unloaded
|
2016-03-17 20:11:38 -04:00 |
|
aidancbrady
|
650b725567
|
Use handy Forge methods for damage display instead of setting item damage in gas/energy/fluid indicators
|
2016-03-17 14:23:53 -04:00 |
|
aidancbrady
|
97eeeb5ed3
|
Better Factory energy usage display, added new reactor LUA commands
|
2016-03-17 09:28:45 -04:00 |
|
aidancbrady
|
38a68541c4
|
Tiered Bins, better tier management!
|
2016-03-16 21:41:55 -04:00 |
|
aidancbrady
|
a5c5a093fa
|
Cleanup
|
2016-03-15 20:06:35 -04:00 |
|
aidancbrady
|
6b73b4153c
|
Fixed misbehaving collision boxes
|
2016-03-15 19:44:16 -04:00 |
|
aidancbrady
|
ca7fc4aaf4
|
Formulaic Assemblicators are cool!
|
2016-03-15 19:30:16 -04:00 |
|
aidancbrady
|
9c8e392638
|
Loads more work on Formulaic Assemblicators. Seem to be about polished!
|
2016-03-15 19:07:22 -04:00 |
|
aidancbrady
|
779c2c49e7
|
Lots of work on Formulaic Assemblicators, still need to do a good bit of polishing
|
2016-03-15 17:34:17 -04:00 |
|
aidancbrady
|
1dfc35c6dd
|
Fixed a small Digital Miner issue, fixed Adv. Solar Gen model
|
2016-03-15 00:15:19 -04:00 |
|
aidancbrady
|
a87b088be6
|
Work on Formulaic Assemblicator, also added some new fancy models from @CyanideX!
|
2016-03-14 23:57:37 -04:00 |
|
aidancbrady
|
6f4e73d15e
|
Work on Formulaic Assemblicator, many fixes
|
2016-03-12 11:43:44 -05:00 |
|
aidancbrady
|
f31e32fcf2
|
More Assemblicator work, added Crafting Formula item
|
2016-03-06 19:05:34 -05:00 |
|
aidancbrady
|
a247a80d53
|
Work on Formulaic Assemblicator, got a lot more of the core logic done than I was expecting to
|
2016-03-06 17:53:16 -05:00 |
|
aidancbrady
|
2db6fde118
|
EnergyNetwork now only distributes demanded energy to acceptors instead of forcing transfer, should fix interaction issues
|
2016-03-06 13:51:11 -05:00 |
|
aidancbrady
|
1eff6ad6b8
|
Ship with CoFH energy API (as well as a few item tidbits). It's about time
|
2016-03-06 12:42:04 -05:00 |
|
aidancbrady
|
34d55f72ea
|
More fluid container integration, removed dead code
|
2016-03-06 02:57:32 -05:00 |
|
aidancbrady
|
d332ad49b7
|
More consolidated fluid container management- I've been meaning to get to this for a long time
|
2016-03-06 02:15:56 -05:00 |
|
aidancbrady
|
d77de295f2
|
Modified factory-capable machine side data to match that of factories, allowing for configuration preservation
|
2016-03-05 19:33:02 -05:00 |
|
aidancbrady
|
b13d8ee1ab
|
Fixed fluid duplication
|
2016-03-05 18:48:49 -05:00 |
|
aidancbrady
|
13996faacb
|
Better particle rendering, bubbles when scuba tank is active, improved jetpack hover mode to disable when player is grounded
|
2016-03-05 18:28:52 -05:00 |
|
aidancbrady
|
4e41b46df7
|
Fix up Bin rendering
|
2016-03-05 15:18:40 -05:00 |
|
aidancbrady
|
866c76bafe
|
Redesigned Filter Cards to serve as Configuration Cards, fixed inventory interaction bug, fixed Creative Energy Cube bug, added new recipes
|
2016-03-05 13:17:58 -05:00 |
|
aidancbrady
|
668643e663
|
Entangloporters work perfectly!
|
2016-03-04 21:58:13 -05:00 |
|
aidancbrady
|
f8f8dfa737
|
More work on entangloporters
|
2016-03-04 13:14:48 -05:00 |
|
aidancbrady
|
c03b712ed2
|
More work. I'm gonna let the configuration component determine send/receive instead of cluttering the GUI more
|
2016-03-04 12:07:34 -05:00 |
|
aidancbrady
|
8bd6b6e367
|
Merge branch 'master' into development
* master:
Part pt_BR update
|
2016-03-04 11:06:31 -05:00 |
|
aidancbrady
|
ad15e359ac
|
Work on Quantum Entangloporters. I get the feeling this is gonna be a big project
|
2016-03-04 11:06:05 -05:00 |
|
Aidan
|
833064b3ab
|
Merge pull request #3117 from EzerArch/patch-1
Part-update pt_BR lang
|
2016-03-04 11:01:30 -05:00 |
|
EzerArch
|
679aa28dd3
|
Part pt_BR update
Partial pt_BR locale update.
|
2016-03-02 12:05:26 -03:00 |
|
Ezer Arch
|
e3d0b76d77
|
Merge pull request #1 from aidancbrady/master
Sync
|
2016-03-02 10:53:04 -03:00 |
|
aidancbrady
|
cfb0986a48
|
Added fancy graphs to display boil rate and max boil value of boilers, boiler valves now connect to corresponding tanks of multiblock based on location
|
2016-03-01 13:37:19 -05:00 |
|
aidancbrady
|
382116b659
|
Hopefully final build fix
|
2016-03-01 10:29:43 -05:00 |
|
aidancbrady
|
30fbfc32d6
|
Another try
|
2016-03-01 10:26:57 -05:00 |
|
aidancbrady
|
8b9098b350
|
Another build fix attempt
|
2016-03-01 10:25:06 -05:00 |
|
aidancbrady
|
4644e75202
|
Work on boiler stats panel, hopefully fix build
|
2016-03-01 10:22:24 -05:00 |
|
aidancbrady
|
1071f2fb4d
|
Adjusted numbers, everything is now nice and balanced
|
2016-02-29 00:31:19 -05:00 |
|
aidancbrady
|
f09010a927
|
Many more fixes
|
2016-02-28 19:11:43 -05:00 |
|
aidancbrady
|
7c160cc264
|
Interface and rendering fixes
|
2016-02-28 18:11:50 -05:00 |
|
aidancbrady
|
c0f465d0cb
|
Boiler rendering and interface, still yet to do statistics
|
2016-02-28 16:44:05 -05:00 |
|
aidancbrady
|
2451ac4819
|
Completed merge
|
2016-02-28 12:32:36 -05:00 |
|
aidancbrady
|
3d43a96f91
|
Merge branch 'master' into development
* master:
Fixed Induction Matrix issue
|
2016-02-28 12:31:34 -05:00 |
|
aidancbrady
|
9d43e4ab49
|
Fixed Induction Matrix issue
|
2016-02-28 12:31:27 -05:00 |
|
aidancbrady
|
155758398c
|
Continued boiler work
|
2016-02-28 11:52:52 -05:00 |
|
aidancbrady
|
87438dcc7f
|
Boiler work, added heat info tab, worked on polishing heat interactions among machines
|
2016-02-27 13:32:48 -05:00 |
|
aidancbrady
|
9b9ed0a4c0
|
Polished resistive heaters, fixed a small bug in the sound system (a bit uncleanly)
|
2016-02-27 01:27:26 -05:00 |
|
aidancbrady
|
63335a57c8
|
Resistive heater is just about done!
|
2016-02-26 20:44:21 -05:00 |
|
aidancbrady
|
9d55f6cc8a
|
Lots of work on resistive heaters, still mostly unfinished
|
2016-02-26 19:51:37 -05:00 |
|