Commit graph

95 commits

Author SHA1 Message Date
Ben Spiers 3fcce24bac Move client configs to their own category, with new gui screen to match. 2014-08-15 02:58:44 +01:00
Aidan Brady c66f3a44b7 Merge branch '1.8' of https://github.com/aidancbrady/Mekanism into 1.8 2014-08-09 22:20:59 -04:00
Aidan Brady 1d6de974d3 A bit of package reorganization, added InventoryNetwork to transporters 2014-08-09 22:20:49 -04:00
Ben Spiers 191d964003 More Entanglement work. Now has a gui, can set it's frequency. 2014-08-10 02:17:02 +01:00
Ben Spiers 40659dcdac Very start of a working teleportation system. Works for Energy and Fluids, probably Gases. Not Items yet. 2014-08-09 02:08:38 +01:00
Ben Spiers 14852b0b5d Move some more code into the Blocks and Items classes, and fix the ObjectHolder annotations. Don't think it's going to be possible to make the Tools items work with ObjectHolder (they'd need to be final fields I think) because the material enums need to be initialised first. 2014-08-03 20:27:20 +01:00
Ben Spiers 725b7463f0 Make the mod classes significantly less godlike.
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
2014-08-01 01:35:06 +01:00
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
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
Ben Spiers 775ba68482 Tweaking of lasers for packet-efficiency 2014-07-22 22:34:19 +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
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 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 9469fcb51a Started work on actual flame implementation 2014-07-17 20:06:51 -04:00
Aidan C. Brady be7ea115b6 Some work on flamethrower sounds, also refactored sound system to allow for multiple sounds from a single object reference (to allow flamethrower and jetpack sounds to work simultaneously) 2014-07-16 16:59:45 -04:00
Ben Spiers bdde617489 More work on Fusion Reactor 2014-07-16 02:54:13 +01:00
Aidan C. Brady 9abc111ecd Baby Skeletons, started work on Flamethrower 2014-07-12 22:34:58 -04:00
Aidan C. Brady df31833cb6 Tiny cleanup 2014-07-08 14:13:29 -04:00
Ben Spiers 4e32a77ac8 Fix Client/Server issues. 2014-07-07 23:33:48 +01:00
Ben Spiers df58560729 Clean up configs a lot; Fix Config GUIs. This will require people to sort out their configs on their own, as things have moved. 2014-07-07 21:23:04 +01:00
Ben Spiers 4d0f276e55 Fix a server crash relating to a client-side only class initialization (credit to @kosakriszi). Closes #1442. 2014-06-27 03:25:47 +01:00
Ben Spiers ff1b3b792e Config GUIs are cool. 2014-06-27 03:22:46 +01:00
Aidan C. Brady 90da466ca1 Started work on Fluidic Plenisher 2014-06-19 12:42:59 +02:00
Aidan C. Brady a3784d1fe7 More portable tank work, mainly on GUIs 2014-06-18 21:05:32 +02:00
Aidan C. Brady adc8a9bc23 Portable Buckets...a lot more work than I thought 2014-06-18 19:42:57 +02:00
Aidan C. Brady fd74ee5c92 Started work on Portable Tank 2014-06-18 03:01:23 +02:00
Aidan C. Brady 0528f1aace Fix NEI offset for PRC, gave PRC a model, added specific sides for machines 2014-06-17 01:52:59 +02:00
Aidan C. Brady 5fd89a7959 Added recipe for PRC, energy type is now controlled by server (closes #1369) 2014-06-16 02:09:31 +02:00
Aidan C. Brady 75f09adba2 Seismic Vibrator model 2014-06-16 01:50:40 +02:00
Aidan C. Brady 49c7b1062a Improved gas handling, fixed ignoring "NONE" connection. Also got common-side tick handlers up and running again 2014-06-10 12:49:49 +02:00
Aidan C. Brady f0d3848f8a Sounds work! Also got tick handlers set up, still have to do a few things 2014-06-03 20:57:59 +02:00
Aidan C. Brady 815944c49a A major load of fixes - things should be about back to normal now. 2014-06-03 19:54:45 +02:00
Aidan C. Brady b365494f2e Fixed up logger, added needed overlays 2014-06-03 08:46:03 +02:00
Aidan C. Brady 5b611c9cdb 0 errors. This is it, the first building build of Mekanism for 1.7.2, and also the most buggy build of Mekanism to date most likely.
(I remembered to update the obfuscated reflections, so there's that)
2014-06-03 00:21:00 +02:00
Aidan C. Brady 4446e14ba3 Sound system work 2014-06-02 23:57:40 +02:00
Aidan C. Brady 295efab7b2 More error fixes, down to 11! 2014-06-02 20:04:10 +02:00
Aidan C. Brady fa0c2e6f12 More bits of work 2014-05-30 23:10:05 +02:00
Aidan C. Brady d1c193d0dd Loads more work. 275 errors. 2014-05-29 19:01:43 +01:00
Aidan C. Brady 6f69c6d7b4 Major 1.7 work, down to a little more than 500 errors 2014-05-29 17:55:47 +01:00
Ben Spiers 3d8c5c8696 More fixes. Around 1000 errors now, going to have to leave it to you from here on in @aidancbrady. 2014-04-20 22:34:45 +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
Renamed from common/mekanism/client/ClientProxy.java (Browse further)