AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 11:15:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,246 Commits 29 Branches 143 Tags
Commit Graph

4246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
4c19d06c97 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/Blocks.scala
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/Recipes.scala
 2014-02-12 15:49:48 +01:00
Florian Nücke
b931baeb72 changed a couple of failure cases to return nil, message instead of false, message, for consistency 2014-02-12 14:51:52 +01:00
Florian Nücke
4f9dbf3881 component inventory now clears the tag items are saved to before calling their save method, to behave like tile entities when saving (i.e. get a clean tag, so old stuff doesn't have to be deleted manually); reworked recipe registration to add a pre-registration step that's done right in the item instantiation, keeping things in one place (less likely to forget adding recipes) 2014-02-12 14:41:33 +01:00
Florian Nücke
fde1488578 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/robot/Player.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
 2014-02-12 13:26:06 +01:00
Florian Nücke
f639ecb00f Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-02-12 13:11:00 +01:00
Florian Nücke
4099592f19 fixed wget help 2014-02-12 13:10:22 +01:00
Florian Nücke
44ae3dc68a Merge pull request #116 from YuRaNnNzZZ/patch-1 
Update ru_RU.lang
 2014-02-12 13:07:18 +01:00
Florian Nücke
67ed9876ad fixed robot "orientation" not being properly set when breaking blocks, which made some tools behave incorrectly if they did custom raytracing; added special check for TC tools to offset fake player position for raytracing 2014-02-12 07:10:01 +01:00
YuRaNnNzZZ
c9cdae9cce Update ru_RU.lang 2014-02-11 19:37:23 -08:00
Florian Nücke
41ebd349ea Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-12 00:54:43 +01:00
Florian Nücke
80595a8583 forcing going into fallback mode on windows server 2003 to avoid crash 2014-02-12 00:54:15 +01:00
Florian Nücke
d2d964bc8b Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/common/item/ALU.scala
	src/main/java/li/cil/oc/common/item/Alu.scala
	src/main/java/li/cil/oc/server/component/FileSystem.scala
	src/main/java/li/cil/oc/server/component/Filesystem.scala
	src/main/scala/li/cil/oc/common/item/Alu.scala
	src/main/scala/li/cil/oc/server/component/Filesystem.scala
 2014-02-12 00:24:44 +01:00
Florian Nücke
0e183f8b91 added second tier 1 ram slot to tier 1 case to make tier 1 computers more useful (the ingame component callback doc implementation - wrapping the callbacks as a table - consumes a bit more memory before for each proxy, this is in response to that) 2014-02-11 23:55:27 +01:00
Florian Nücke
a0e5e43ea3 Also removed UDP mention from Russian localization - I hope I didn't screw it up. 2014-02-11 23:44:14 +01:00
Florian Nücke
f32655ac65 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-02-11 23:40:30 +01:00
Florian Nücke
19e73e2cf3 corrected filename casing 2014-02-11 23:39:58 +01:00
Florian Nücke
c4da02b65c removed mention of udp from internet cards, those were a lie; text.serialize now line breaks and indents in pretty print mode; tostringing tables with metatable that has a __tostring method in text.serialize with pretty print; corrected comment in config; explicitly putting textures and localizations into the public domain in the license info; deleting empty file system folders from disk on save to reduce clutter in <saves>/opencomputers dir; doc field of callback annotations can now be read in computers, methods in proxies are tostring'ed to the docstring; returning false from component.modem.close() when no ports are open, now 2014-02-11 23:35:46 +01:00
lordjoda
1cf2a439da Merge pull request #115 from YuRaNnNzZZ/master 
Added Russian localization.
 2014-02-11 16:50:56 +01:00
YuRaNnNzZZ
e325d20e98 Create ru_RU.lang 
Added Russian localization.
 2014-02-11 03:26:50 -08:00
Florian Nücke
81e900bfef added new Keyboard implementation so that keyboard only works on proper sides again, still keeping the old one around for upgrading. 2014-02-10 23:40:42 +01:00
Florian Nücke
9c3e6fca80 adjustments for 1.7 2014-02-10 22:45:52 +01:00
Florian Nücke
ac034907fe Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/Item.scala
	src/main/scala/li/cil/oc/common/tileentity/Cable.scala
	src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala
	src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
	src/main/scala/li/cil/oc/common/tileentity/Keyboard.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
 2014-02-10 22:38:49 +01:00
Florian Nücke
f48d3d304e using tick handler instead of scheduled tick updates to register non-ticking tile entities in the component network 2014-02-10 22:36:08 +01:00
Florian Nücke
bcde36e74c renamed localization keys to be more standard conform 2014-02-10 22:12:14 +01:00
Florian Nücke
a401858a80 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
 2014-02-10 18:24:40 +01:00
Florian Nücke
13a8b75573 moved all peripheral wrapping logic over to here 2014-02-10 18:23:12 +01:00
Florian Nücke
38c231ed71 fixed some bugs; added readme in api package; marked cc filesystem factory methods optional 2014-02-10 18:16:16 +01:00
Florian Nücke
294425ab06 increased default timeout for scripts to avoid timeouts when the system is under load (the threads are very low priority, right now they occasionally starve); increased default render distance for screens a bit; made ManagedPeripheral not extend anything anymore to make it more versatile (in particular, to make it usable with SimpleComponent) 2014-02-10 13:28:55 +01:00
Florian Nücke
49a8c331bf added optional annotation to methods in example code in simplecomponent 2014-02-10 04:02:36 +01:00
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