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
ceec3e71e9
No more errors, the game launches, rejoice!
2016-05-26 03:14:44 -04:00
aidancbrady
a89b8f666c
<200 errors. All I have left is a bit of rendering work and the new "off hand" stuff
2016-05-25 17:30:22 -04:00
aidancbrady
374cc57515
Use new GlStateManager methods, got armor models to render (though the transformations seriously need to be updated)
2016-05-10 22:24:37 -04:00
Ben Spiers
0cb18773aa
Merge branch 'development' into 1.8.9
2016-04-25 16:08:06 +01:00
aidancbrady
67372d703e
Portable Teleporter remembers frequency, new side data functionality for blocks with non-configurable sides, fixed energy cubes not outputting up or down, fixed transmitter lighting
2016-03-31 20:17:00 -04:00
aidancbrady
c481180088
A few bug fixes, added recipes for Security Desk
2016-03-21 19:43:03 -04:00
aidancbrady
f904c8b80c
Start integrating security into all machinery. This is a very rough implementation, there's gonna be a lot of balance and corrections to make before release
2016-03-21 16:53:29 -04:00
Ben Spiers
bc024b851f
GUIs are back!
2016-02-02 00:16:22 +00:00
Ben Spiers
dedc84605f
getInventoryName() -> getName()
2016-01-23 14:24:42 +00:00
Ben Spiers
a80f724cc2
Apply various common one-to-one replacements
...
More work on common too. network package now done.
2016-01-23 13:24:51 +00:00
Ben Spiers
9b8d9d92d6
Start update to 1.8.9
...
Fix all references to cpw.mods.fml namespace
2016-01-14 19:22:48 +00:00
aidancbrady
9ffc1bdff3
Localization fixes, part 1
2015-05-10 19:04:42 -04:00
Aidan C. Brady
41cfed37b7
Fixed a few crashes
2015-04-03 20:21:05 -04:00
Aidan C. Brady
5da4a522cb
A few Portable Teleporter fixes
2015-03-28 20:34:57 -04: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
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
5e5975bc58
Work on new teleporter system - still a lot to do
2015-03-11 10:58:15 -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
c39e3d1c1f
More dropper work
2015-02-26 20:50:02 -05:00
Porter Westling
bb12d91f50
add right click decrement functionality to teleporter digits
2014-09-23 12:06:17 -07:00
Aidan C. Brady
146d974479
Fixed Teleporter localization, fixed balloons placing on non-solid sides, added AE processing recipes, improve tele porter efficiency
2014-07-14 17:14:32 -04:00
Aidan C. Brady
e5f76907ce
Rewrite networking code for the 100th time to fix memory leak
2014-06-11 11:57:49 +02:00
Aidan C. Brady
4446e14ba3
Sound system work
2014-06-02 23:57:40 +02:00
Aidan C. Brady
d1c193d0dd
Loads more work. 275 errors.
2014-05-29 19:01:43 +01:00
tterrag1098
321fa4ed50
Some work on GUIs, mostly sfx
2014-05-06 02:57:39 -04:00
Ben Spiers
31938e8b68
Under 1300 errors left now, started on packet/network stuffs.
2014-04-20 21:15:44 +01:00
Ben Spiers
db7121454a
Re-add an updated ic2, alter CC and update DepLoader. Fix more of the things.
...
1792 errors. A good night's work, I think.
2014-04-20 04:34:19 +01:00
Ben Spiers
ab47724473
Move the directory structure around to a more conventional one and start out on the 1.7 update.
...
3797 errors. We have a long way to go.
2014-04-20 03:44:06 +01:00