Aidan C. Brady
|
77c68b05bf
|
Merge branch 'master' into development
|
2015-03-16 11:03:07 -04:00 |
|
Aidan C. Brady
|
02cb425cbd
|
Work on Oredictionificator operations
|
2015-03-16 11:02:54 -04:00 |
|
Aidan
|
9a704f2812
|
Merge pull request #2211 from Dannerick/myDev1
[#2210] fix for NPE on placing an empty gas-burning generator
|
2015-03-16 11:02:30 -04:00 |
|
Aidan C. Brady
|
d61723c5f7
|
Fixed a few issues - Oredictionificator filter system is done
|
2015-03-16 07:58:53 -04:00 |
|
Aidan C. Brady
|
2cd3d5d899
|
Work on GUI
|
2015-03-15 23:39:55 -04:00 |
|
brian lewis
|
2a1fe5b3e9
|
[#2210] fix for NPE on placing an empty gas-burning generator
|
2015-03-15 19:26:12 -05:00 |
|
Aidan C. Brady
|
f51c528bbf
|
Added recipes for new v8 content
|
2015-03-15 17:57:15 -04:00 |
|
Aidan C. Brady
|
9f20e0bce0
|
Oredictionificator work
|
2015-03-13 20:37:20 -04:00 |
|
Aidan C. Brady
|
6870b211c5
|
Oredictionificator work
|
2015-03-13 10:20:19 -05:00 |
|
Aidan C. Brady
|
8a88df5f1c
|
Start on Oredictionificator!
|
2015-03-13 09:14:57 -05:00 |
|
Aidan C. Brady
|
6e3efacffb
|
Hide Heat Transmitter until it's finished
|
2015-03-12 23:48:13 -05:00 |
|
Aidan C. Brady
|
ca16c64de1
|
Fixed a crash
|
2015-03-12 23:37:04 -05:00 |
|
Aidan C. Brady
|
093d18e6fa
|
Implemented a failsafe tick handler in FrequencyManager, fixed a small deactivation mishap
|
2015-03-12 23:29:11 -05:00 |
|
Aidan C. Brady
|
6801092113
|
Fixed data fetch
|
2015-03-12 23:17:25 -05:00 |
|
Aidan C. Brady
|
f9c10d9012
|
More work on teleporters, implemented chunkloading
|
2015-03-12 22:55:37 -05:00 |
|
Aidan C. Brady
|
9c21621c06
|
Just about finished! Teleporter & Portable Teleporter work with the new frequency system perfectly.
|
2015-03-12 17:30:40 -05:00 |
|
Aidan C. Brady
|
6d36926866
|
Work on Portable Teleporter, need to fix the screwed up GUI
|
2015-03-12 16:52:04 -05:00 |
|
Aidan C. Brady
|
9043e12938
|
Work on new Portable Teleporter GUI - going to basically be a clone of the regular teleporter GUI without an inventory view
|
2015-03-12 11:18:12 -05:00 |
|
Aidan C. Brady
|
d16a6f06ee
|
Teleporting works! Tomorrow I'll try and implement the Portable Teleporter.
|
2015-03-12 01:32:24 -05:00 |
|
Aidan C. Brady
|
cefd4ba107
|
Fixed another NBT issue
|
2015-03-12 01:18:21 -05:00 |
|
Aidan C. Brady
|
c2c3bd14bc
|
Many fixes - still need to get private frequencies to load
|
2015-03-12 01:03:31 -05:00 |
|
Aidan C. Brady
|
dc611eb0b2
|
Work on GUI, things are starting to work
|
2015-03-11 18:13:47 -05:00 |
|
Aidan C. Brady
|
76b93bec65
|
More teleporter work. Getting pretty complicated, hopefully I can pull this off
|
2015-03-11 17:42:33 -05:00 |
|
Aidan C. Brady
|
855a5acf1d
|
Code cleanup
|
2015-03-11 15:41:13 -05:00 |
|
Aidan
|
a86bb36ca0
|
Merge pull request #2193 from Siigari/development
Remastered and looped audio correctly.
|
2015-03-11 11:01:01 -05:00 |
|
Aidan C. Brady
|
8da23839f3
|
Merge branch 'master' into development
Conflicts:
src/main/resources/assets/mekanism/sounds/Elementizer.ogg
|
2015-03-11 11:00:32 -05:00 |
|
Aidan
|
7cfc0c5c3f
|
Merge pull request #2192 from Siigari/master
Remastered, downmixed audio, improved levels, created seamless looping.
|
2015-03-11 10:59:48 -05:00 |
|
Aidan
|
c394c7c9bb
|
Merge pull request #2186 from Archtikz/development
Completely remade Seismic Reader.
|
2015-03-11 10:59:31 -05:00 |
|
Aidan C. Brady
|
5e5975bc58
|
Work on new teleporter system - still a lot to do
|
2015-03-11 10:58:15 -05:00 |
|
Aidan C. Brady
|
605532adab
|
Added frequency framework, should make creating frequency-based teleportation networks a breeze
|
2015-03-09 23:55:32 -05:00 |
|
Siigari
|
71d712e4f6
|
Remastered and looped audio correctly.
|
2015-03-09 20:35:28 -07:00 |
|
Siigari
|
58ea87fef0
|
Remastered and downmixed audio, improved levels and created seamless looping.
|
2015-03-09 19:58:07 -07:00 |
|
Archtikz
|
1d4ff14013
|
Some more work on the Seismic Reader, tooltips and scaling changes
|
2015-03-09 22:10:15 +00:00 |
|
Aidan C. Brady
|
6ebf226db0
|
Make sure to save chunk changes
|
2015-03-09 15:38:18 -05:00 |
|
Aidan C. Brady
|
e3ca5ccecd
|
Implemented the new systems in factories and chemical crystallizers, added better configurator mode switch tooltips
|
2015-03-08 18:55:56 -05:00 |
|
Aidan C. Brady
|
93df96851a
|
Added remaining framework for gas/fluid tank handling, finished new configuration implementation for PRC and Chemical Injection Chamber
|
2015-03-08 18:24:21 -05:00 |
|
Archtikz
|
4f91277261
|
Completely remade Seismic Reader, may not be 100% efficient as it could
be and I've bug tested as much as I can.
|
2015-03-08 19:16:21 +00:00 |
|
Aidan C. Brady
|
18e23bb74c
|
Better tooltips
|
2015-03-08 13:36:04 -05:00 |
|
Aidan C. Brady
|
8ce105d95f
|
More configuration work
|
2015-03-08 13:27:34 -05:00 |
|
Aidan C. Brady
|
1f59f8ca1d
|
Finished implementation of sided energy configuration. Yay!
|
2015-03-08 00:59:39 -06:00 |
|
Aidan C. Brady
|
e70650154d
|
Added energy config readiness to all configurable machines, still yet to actually implement energy management
|
2015-03-07 23:55:22 -06:00 |
|
Aidan C. Brady
|
1bff3a93da
|
Just about finished new Side Configuration GUI
|
2015-03-07 23:38:20 -05:00 |
|
Aidan C. Brady
|
28b209800a
|
Quick fix for transporter color issue
|
2015-03-07 22:16:23 -05:00 |
|
Aidan C. Brady
|
78c3fe50ca
|
Finished the separation of transporter and side configs
|
2015-03-07 22:11:10 -05:00 |
|
Aidan C. Brady
|
c84e13124a
|
Work on configuration GUI
|
2015-03-07 21:19:59 -05:00 |
|
Aidan C. Brady
|
3f41027325
|
Started work on the new configuration interfaces, separated the transporter configuration from general side configuration, reorganized GUI elements into their own package
|
2015-03-07 21:08:28 -05:00 |
|
Aidan C. Brady
|
4085cb297d
|
Fixed a few bugs with the new system
|
2015-03-07 19:22:54 -05:00 |
|
Aidan C. Brady
|
d4d7e88c4e
|
Developed and implemented the foundation for Item/Gas/Energy/Fluid/Heat dynamic side configuration.
As of now, only items are supported, and the actual config GUI has not been changed. Only gameplay difference is three new configurator modes.
|
2015-03-07 19:09:23 -05:00 |
|
Aidan C. Brady
|
35518ad01f
|
Fixed some tooltips, Hohlraum now properly accepts D-T fuel, added Hohlraum recipe, added lithium to EIM recipes
|
2015-03-06 07:50:09 -05:00 |
|
Aidan C. Brady
|
c1fc1c7cfb
|
Added hohlraum, added D-T fuel recipe to Chemical Infuser, added a few missing tooltips
|
2015-03-05 22:53:07 -05:00 |
|