Commit Graph
24 Commits
Author SHA1 Message Date
Tom Elfring f493221381 Fix more UUID changes. Fix Robit owner.
Fixes: #4342 and #4345.
2017-04-26 18:50:46 +02:00
aidancbrady 8ae57bd9af Remove teleporter command, deprecated and silly 2017-04-24 14:23:07 -04:00
aidancbrady 6f2b84e547 Totally refactor frequencies to use UUIDs instead of player usernames 2017-04-24 14:15:43 -04:00
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 3505d553d9 Merge branch 'development' into 1.9.4
* development:
  Fixed Robit AI
  Fixed Robit dupe glitch
  Fixed the stupid invalid frequency issue

Conflicts:
	src/main/java/mekanism/client/ClientProxy.java
	src/main/java/mekanism/client/gui/GuiRobitCrafting.java
	src/main/java/mekanism/client/gui/GuiRobitRepair.java
	src/main/java/mekanism/common/CommonProxy.java
	src/main/java/mekanism/common/RobitAIPickup.java
	src/main/java/mekanism/common/inventory/container/ContainerRobitCrafting.java
	src/main/java/mekanism/common/inventory/container/ContainerRobitRepair.java
	src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
2016-07-05 18:42:43 -04:00
aidancbrady f4582dbccf Fixed the stupid invalid frequency issue 2016-07-05 17:01:58 -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
Ben Spiers 0cb18773aa Merge branch 'development' into 1.8.9 2016-04-25 16:08:06 +01:00
aidancbrady c481180088 A few bug fixes, added recipes for Security Desk 2016-03-21 19:43:03 -04:00
Ben Spiers 84336ec4d1 Merge branch 'development' into 1.8.9
Huge merge with 202 conflicts, hopefully not *too* broken.
2016-03-18 04:24:19 +00:00
aidancbrady f8f8dfa737 More work on entangloporters 2016-03-04 13:14:48 -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
Ben Spiers ac39b6fabe Merge branch 'v9' into 1.8.9 2016-02-08 14:55:27 +00:00
aidancbrady 2bea8ac29a Work on Thermodynamic Conductors 2016-02-03 11:08:36 -05:00
Ben Spiers 591fc1e4b4 Fix up most of the common package, blocks and tiles excluded. 2016-01-23 19:11:16 +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
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 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 c2c3bd14bc Many fixes - still need to get private frequencies to load 2015-03-12 01:03:31 -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 605532adab Added frequency framework, should make creating frequency-based teleportation networks a breeze 2015-03-09 23:55:32 -05:00