AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-24 04:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,139 Commits 29 Branches 143 Tags
Commit Graph

1139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
5c597e85fb removed fmp libs until they exists for 1.7 2014-03-02 22:35:33 +01:00
Florian Nücke
340752f491 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/server/TickHandler.scala
	src/main/resources/mcmod.info
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/Cable.scala
	src/main/scala/li/cil/oc/common/block/Capacitor.scala
	src/main/scala/li/cil/oc/common/block/Delegate.scala
	src/main/scala/li/cil/oc/common/block/Delegator.scala
	src/main/scala/li/cil/oc/common/block/DiskDrive.scala
	src/main/scala/li/cil/oc/common/block/KeyboardDeprecated.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Router.scala
	src/main/scala/li/cil/oc/common/tileentity/Capacitor.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
 2014-03-02 22:35:06 +01:00
Florian Nücke
dd38ad4cba workaround for reobfuscation issue (calls to methods in fmp lib that should have been reobfed weren't) 2014-03-02 21:44:33 +01:00
Florian Nücke
4cb5c1bf41 made fmp a soft dependency, finishes fmp implementation for cables, closes #3 (at long last!) 2014-03-02 19:47:34 +01:00
Florian Nücke
004a88f47a cleaned up a little 2014-03-02 18:50:03 +01:00
Florian Nücke
e702d0bf63 simplified explosion stuff in multi-block implementation for fmp callbacks 2014-03-02 18:35:35 +01:00
Florian Nücke
61f744dcb9 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into FMP 2014-03-02 18:30:55 +01:00
Florian Nücke
1ebc916747 splitting and joining of multipart cables 2014-03-02 18:30:42 +01:00
Florian Nücke
4ea97c5b86 stupid windows 2014-03-02 17:07:25 +01:00
Florian Nücke
1a86a2ac61 Merge branch 'FMP' of cil.li:oc into FMP 2014-03-02 17:02:11 +01:00
Florian Nücke
36ae2d33a6 nodes in multipart cables connect 2014-03-02 17:02:01 +01:00
Johannes Lohrer
e4c91851c1 Placement of cables in multiblocks 2014-03-02 16:20:46 +01:00
Florian Nücke
7c42c5df60 basic rendering, starting to work on component network in fmp; cleaned up unused update methods in passive blocks 2014-03-02 15:13:52 +01:00
Florian Nücke
fe920be426 made robots creeper blast proof 2014-03-02 13:30:21 +01:00
Johannes Lohrer
8718e88df6 Initial Test 2014-03-02 13:08:19 +01:00
Florian Nücke
49e376b422 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-01 18:00:30 +01:00
Florian Nücke
6f6727d1f0 fixed opening files in write mode when using unbuffered mode (filesystem.bufferChanges = false), fixes #144 2014-03-01 17:59:55 +01:00
Florian Nücke
28b9656443 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-01 16:37:04 +01:00
Florian Nücke
c059c7b90b added config option to allow forcing the mod to try loading the native library even on Win XP and Win Server 2k3 as requested (almost forgot about that one) 2014-03-01 16:14:49 +01:00
Florian Nücke
0d9e9257b6 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-01 14:56:42 +01:00
Florian Nücke
ead4bdf716 fixed AIOOBE 2014-03-01 14:55:33 +01:00
Florian Nücke
7b40afb665 trying to make the class transformer not break in dev env (when obfed), also generally hardening the transformer to avoid crashes 2014-03-01 14:41:07 +01:00
Florian Nücke
8dac8ce704 updated forge version 2014-03-01 13:45:32 +01:00
Florian Nücke
96d8575389 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala
 2014-03-01 13:45:19 +01:00
Florian Nücke
cd8a1658b1 moved power logic up in the class hierarchy to allow other blocks than the power converter to accept energy from other mods - for now those other blocks are the computer case and the server rack. the converter still has its use when connecting to a remote power source, e.g.; added a bunch of checks in save logic to avoid errors when other mods call those methods client side (e.g. waila) 2014-03-01 03:51:46 +01:00
Florian Nücke
8429cd5fb0 forgot to move new class to scala... 2014-02-28 21:54:18 +01:00
Florian Nücke
0f579b374c patched update check for 1.7 2014-02-28 21:33:33 +01:00
Florian Nücke
2d948602a4 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-02-28 21:22:53 +01:00
Florian Nücke
b73f39c443 generator.insert no longer throws if slot was empty (never should have); cleaned and patched up refuel.lua a little 2014-02-28 21:21:22 +01:00
Florian Nücke
7c6837c7ae Merge pull request #143 from Vexatos/patch-3 
Update refuel.lua
 2014-02-28 20:51:18 +01:00
Vexatos
748088a264 Update refuel.lua 2014-02-28 20:50:11 +01:00
Florian Nücke
64e3071108 Merge pull request #142 from Vexatos/patch-2 
Update refuel.lua
 2014-02-28 19:51:55 +01:00
Vexatos
15b5428d45 Update refuel.lua 2014-02-28 19:50:51 +01:00
Vexatos
70e02e657e Update refuel.lua 
I hope this works.
 2014-02-28 19:45:01 +01:00
Florian Nücke
8c0c808037 added dynamic fs for generator (preparation for refuel program) 2014-02-28 19:32:53 +01:00
Florian Nücke
67fd960c54 gzipping clipboard text, putting it on a cooldown (1ms / char), increased char limit to 64k 2014-02-28 19:06:01 +01:00
Florian Nücke
f10ba0ed31 fixed special handling for TC tools to allow fallback to 'normal' mode (e.g. hammers on dirt) 2014-02-28 17:11:10 +01:00
Florian Nücke
c850cb52bb switched to scala's built-in json parser, because argo seems to be gone in 1.7 2014-02-28 17:07:04 +01:00
Florian Nücke
d0867bacbd Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/common/ConnectionHandler.scala
	src/main/resources/mcmod.info
	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-28 16:17:56 +01:00
Florian Nücke
99059f016c bumped version number 2014-02-28 15:28:31 +01:00
Florian Nücke
980492e336 might server as sort of backwards compatibility, at least can't hurt. i think. 2014-02-28 15:27:18 +01:00
Florian Nücke
d3b96360c2 removed unnecessary require 2014-02-28 14:12:43 +01:00
Florian Nücke
41869155fc Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-02-28 14:10:38 +01:00
Florian Nücke
8d14d4fadc when adding the iron nugget recipe, also add recipe to convert nuggets back to ingot 2014-02-28 14:10:21 +01:00
Florian Nücke
17245539a5 Merge pull request #141 from Vexatos/patch-2 
Update de_DE.lang
 2014-02-28 13:44:39 +01:00
Florian Nücke
963dc1af35 Merge pull request #140 from Wobbo/master 
Added $EDITOR and $TERM
 2014-02-28 13:36:00 +01:00
Vexatos
dbca983797 Update de_DE.lang 2014-02-28 10:06:39 +01:00
Wobbo
2f1a722d4f I have to add all the $VARS, do I? :P 2014-02-27 22:02:16 +01:00
Florian Nücke
42126367d0 localized new version notification; added setting to turn off update checking; only showing new version notification in local games and to ops; cleaned up update check a little, storing result so we only need to query Github once (not on every player join), logging errors, using ComparableVersion for comparison 2014-02-27 18:06:02 +01:00
Johannes Lohrer
2fa6632ba9 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-02-27 16:31:14 +01:00