AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-10-01 00:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,217 Commits 29 Branches 143 Tags
Commit Graph

5217 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
2f3f52adc1 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Also updated srg names where used.

Conflicts:
	src/main/scala/li/cil/oc/client/GuiHandler.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
 2014-02-10 03:45:15 +01:00
Florian Nücke
48d17315fc undid weird replace in railcraft api (wtf?) and some minor cleanup 2014-02-10 03:19:45 +01:00
Florian Nücke
a4898e269d Merge branch 'master' of https://github.com/MightyPirates/OpenComponents 2014-02-10 03:10:48 +01:00
Florian Nücke
b442981fbf added check to avoid duplicate components when a block next to the adapter already has an environment interface in addition to a peripheral interface 2014-02-10 03:10:30 +01:00
Florian Nücke
8aff007171 added an interface that can be used to mark tile entities as components. a class transformer is used to then inject any component related functionality into the marked tile entities, and the tile entities just have to mark methods with the Callback annotation. 2014-02-10 03:07:10 +01:00
Florian Nücke
7ae42dbb48 made ManagedPeripheral extend Environment directly, to allow implementing said interface in TileEntities directly 2014-02-09 17:16:17 +01:00
Florian Nücke
5756b52cd0 fixed not showing 'out of range' error when bound server isn't loaded, e.g. because too far away from the chunk or in another dimension 2014-02-09 16:26:34 +01:00
Florian Nücke
6adf8c3e02 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Delegator.scala
 2014-02-09 15:23:57 +01:00
Florian Nücke
77f0c0bcb4 fixed remote terminals' connection not being saved correctly 2014-02-09 15:21:01 +01:00
Florian Nücke
18d1f6de35 ignoring any invalid states when entering executor thread now, should avoid computers stopping due to race conditions and shouldn't have any negative side effects 2014-02-09 15:15:30 +01:00
Florian Nücke
b401f4c3b6 fixed npe and directly open server gui on client to avoid issues when quickly changing equipped item after trying to open it; changing up some code, might help with an issue reported in irc 2014-02-09 13:14:41 +01:00
Florian Nücke
6ffb6a0951 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/PacketHandler.scala
v2.0.0-pre1 		2014-02-09 01:08:23 +01:00
Florian Nücke
d5e31319fa localized 'address copied' message v1.2.0-pre3 2014-02-09 01:05:39 +01:00
Florian Nücke
ac0e63c40a adjustments for 1.7 2014-02-09 00:48:51 +01:00
Florian Nücke
f826a62cbe Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-09 00:44:52 +01:00
Florian Nücke
6aa75d1bc6 number of terminals that can be bound to a single server rack now increases with server tier (2, 4, 8 by default) 2014-02-09 00:43:10 +01:00
Johannes Lohrer
61dc9b78f1 Merge branch 'master' of github.com:MightyPirates/OpenComponents 
Conflicts:
	src/main/java/li/cil/occ/OpenComponents.java
 2014-02-09 00:28:23 +01:00
Johannes Lohrer
08561dc720 Added Railcraft, TMechworks 2014-02-09 00:27:08 +01:00
Florian Nücke
05fb8f01ba multiple tiers for servers, with different inventory sizes and costs 2014-02-09 00:11:00 +01:00
Florian Nücke
0b3c9ddecd cleaned up after peripheral redesign 2014-02-08 22:45:19 +01:00
Florian Nücke
2636f02400 Merge branch 'master' of https://github.com/MightyPirates/OpenComponents 2014-02-08 22:30:04 +01:00
Florian Nücke
98cbaffca6 cc peripherals are now wrapped by default and can be disabled using a blacklist (in the config) 2014-02-08 22:29:39 +01:00
Florian Nücke
b12913b8b7 fixed internet card and abstract bus card in servers; made server implement context 2014-02-08 22:09:33 +01:00
Johannes Lohrer
704bb64ce1 added MassFab and Lamp 2014-02-08 19:48:36 +01:00
Florian Nücke
669d2c218f Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-08 19:45:05 +01:00
Florian Nücke
2bbe942d66 adjusted mcmod.info so it don't crash forge when published 2014-02-08 19:44:00 +01:00
Florian Nücke
8da6b4bd98 yet more refactoring! 2014-02-08 19:19:31 +01:00
Florian Nücke
f28257a049 me so indecisive 2014-02-08 19:18:19 +01:00
Florian Nücke
4dc5be944f more refactoring 2014-02-08 19:14:16 +01:00
Florian Nücke
3e879f5473 Merge branch 'master' of https://github.com/MightyPirates/OpenComponents 
Conflicts:
	src/main/java/li/cil/occ/OpenComponents.java
 2014-02-08 19:03:25 +01:00
Johannes Lohrer
1dd3811260 Added AtomicScience 2014-02-08 19:02:24 +01:00
Florian Nücke
df509e9ba9 started refactor into own package 2014-02-08 19:01:50 +01:00
Johannes Lohrer
45469ab282 added all remaining mekanism TEs 2014-02-08 18:48:42 +01:00
Florian Nücke
c54980c99b improved stability of component swap. there still seems to be very rare glitch when switching from one existing component to another (e.g. two screens connected -> remove primary one) 2014-02-08 18:42:06 +01:00
Florian Nücke
ccb5e54f44 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-08 16:38:00 +01:00
Florian Nücke
6659d0e215 registering generic peripheral driver last, to prefer more specialized implementations 2014-02-08 16:30:32 +01:00
Florian Nücke
933aae053a preferring callbacks via annotation over those from peripherals to allow overrides 2014-02-08 16:29:30 +01:00
Florian Nücke
4e71de049a Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
 2014-02-08 16:15:59 +01:00
Florian Nücke
cfff7e5917 carriage controller component is called 'carriage' again 2014-02-08 16:06:17 +01:00
Florian Nücke
5cb549741f added interface to allow overriding name for compound drivers 2014-02-08 16:05:40 +01:00
Florian Nücke
23d8b988b8 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/item/Terminal.scala
	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
 2014-02-08 15:03:24 +01:00
Florian Nücke
597770dd1b Context.address is now deprecated in favor of the new Context.node getter; emulating peripheral file system mounting; catching any errors in connect and disconnect callbacks 2014-02-08 14:52:34 +01:00
Florian Nücke
2bc84f49a5 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-08 13:52:59 +01:00
Florian Nücke
c2dc1f4e30 cleanup; reenabled drivers 2014-02-08 13:52:30 +01:00
Florian Nücke
110d15ff50 fixed match error; adding a tiny delay when switching primary components. this is mainly required for term.read, sh and lua to react to screens/gpu disappearing and reappearing 2014-02-08 13:51:34 +01:00
Johannes Lohrer
0105ee4156 added mekanism but not working for now! deactivated most drivers so don't use 2014-02-08 12:04:32 +01:00
Florian Nücke
d1d9a79bc9 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-08 03:27:10 +01:00
Florian Nücke
3097d7657b fixed shell.running 2014-02-08 03:26:45 +01:00
Florian Nücke
97d2c8ad88 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-08 03:22:34 +01:00
Florian Nücke
dbdfcdba5d fixed loading files into memory for file systems with a limited capacity backed by a folder in the save folder: if the real files were too big, an out of space exception was thrown, which in bad cases could even bubble and crash. we now allow exceeding the capacity of file systems, when loaded from disk; added try-catch around component load and save code, just in case 2014-02-08 03:20:41 +01:00