AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-22 11:52:38 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,402 Commits 29 Branches 143 Tags
Commit Graph

2402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
d4b8149e2f Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
 2014-08-07 17:36:05 +02:00
Florian Nücke
63740cac8a Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-07 17:34:07 +02:00
Florian Nücke
de44148df3 Fixed potential NPE in server rack (since: sided fix for internal switch mode). 2014-08-07 17:33:30 +02:00
Florian Nücke
0a18c22e4d Meh. 2014-08-07 17:30:50 +02:00
Florian Nücke
4f9ac09f04 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-06 13:30:35 +02:00
Florian Nücke
c5c58bf9d0 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-06 13:30:09 +02:00
Florian Nücke
16d0062a9f Giving a clearer error message if programs cannot be started because the set shell cannot be found, closes #470. 2014-08-06 13:29:49 +02:00
Florian Nücke
37e3eb93bd Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-06 13:23:03 +02:00
Florian Nücke
2e57a56704 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-06 13:22:31 +02:00
Florian Nücke
a08fa3be5d Fixed tmp file system's usage counter not being properly reset when closed and not being recomputed on load, closes #471. 2014-08-06 13:22:09 +02:00
Florian Nücke
3021ac1c94 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
 2014-08-06 00:11:18 +02:00
Florian Nücke
60e25947c5 Fixed audio tick handler never being registered. 2014-08-06 00:10:35 +02:00
Florian Nücke
81f99a74a5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
 2014-08-06 00:08:18 +02:00
Florian Nücke
e39768e155 Cleaned up event listener registration a little, moving it all to init... can't remember why this was all over the place. Maybe this will break stuff. 2014-08-05 23:51:59 +02:00
Florian Nücke
6cebca0e86 Added config entry to allow ignoring power from specific supported power mods, closes #458. 2014-08-05 23:50:12 +02:00
Florian Nücke
3d18bd6877 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-05 00:59:48 +02:00
Florian Nücke
81dcab9b74 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-05 00:58:22 +02:00
Florian Nücke
2b69b059cf Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-05 00:58:16 +02:00
Florian Nücke
7bdc52d0c2 Fixes #467. 2014-08-05 00:55:40 +02:00
Florian Nücke
e42caf765b Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-04 23:56:30 +02:00
Florian Nücke
aa0347b01b Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-04 23:56:18 +02:00
Florian Nücke
b53bf2020f Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-04 23:55:55 +02:00
Florian Nücke
18213bde2a Fixed setmetatable(t, nil), closes #464. 2014-08-04 23:55:23 +02:00
Florian Nücke
8fd516e0e7 Added check for presence of Dynious update checker, using that to inform users of updates if so. Closes #460. 2014-08-04 23:28:01 +02:00
Florian Nücke
58b8a1933c Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/Localization.scala
	src/main/scala/li/cil/oc/UpdateCheck.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
 2014-08-04 23:11:14 +02:00
Florian Nücke
0aa20d5347 Missed one. 2014-08-04 23:08:48 +02:00
Florian Nücke
0201935382 Little bit of cleanup. 2014-08-04 23:05:42 +02:00
Florian Nücke
2e30758c84 Switched to GSON for update checker, since Scala's JSON libs have been deprecated. 2014-08-04 22:58:11 +02:00
Florian Nücke
f2d97a9b17 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-04 17:52:34 +02:00
Florian Nücke
faf6c50654 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-04 17:52:23 +02:00
Florian Nücke
2ca2dfe40d Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-04 17:52:00 +02:00
Florian Nücke
f685f81cc7 Fixes #463 - io.lines() was derped. 2014-08-04 17:51:37 +02:00
Florian Nücke
29d455828b Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-03 16:29:20 +02:00
Florian Nücke
aeb5518c90 Fixed massive derp in chunk loader, should fix #440. 2014-08-03 16:28:59 +02:00
Florian Nücke
b4b0dc72d9 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	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/RobotAfterimage.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2014-08-03 15:11:23 +02:00
Florian Nücke
ab7b88d1a0 Made robot afterimages declare themselves as air blocks and made robots ignore afterimages when moving, to avoid potential issues when for some reason they were not properly cleaned up (e.g. on chunk borders after world loads). Might help with #440. 2014-08-03 15:07:49 +02:00
Florian Nücke
c8dcc38114 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-03 14:13:59 +02:00
Florian Nücke
4b49b579d2 Properly sync touch mode when first sending screen state to clients. 2014-08-03 14:13:37 +02:00
Florian Nücke
eb10804800 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
 2014-08-03 14:11:10 +02:00
Florian Nücke
92ce6fd634 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-08-03 14:06:26 +02:00
Florian Nücke
54e647c04e Added API method for T2 and T3 screens to toggle the mode with which the GUI is opened (sneak or non-sneak) for touch driven programs. Closes #433. 2014-08-03 14:06:08 +02:00
Florian Nücke
676af1bbf5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-02 21:03:55 +02:00
Florian "Sangar" Nücke
8fdb7868f1 Merge pull request #461 from Adaptivity/patch-1 
Update ru_RU.lang
 2014-08-02 21:03:32 +02:00
Florian Nücke
a2603abc25 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-02 20:49:36 +02:00
Florian Nücke
c3c11c80d2 Derp. 2014-08-02 20:49:19 +02:00
Florian Nücke
29878fe75a Adjusted power conversion values. 2014-08-02 20:19:36 +02:00
Florian Nücke
613fe3e9c8 Adjusted to IC2 classic API change in 1.7... 2014-08-02 20:05:09 +02:00
Florian Nücke
330d61b41b Disabled fingerprinting for now. 2014-08-02 19:52:12 +02:00
Florian Nücke
9b2cfcbf31 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/asm/ClassTransformer.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Mekanism.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/ThermalExpansion.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/UniversalElectricity.scala
	src/main/scala/li/cil/oc/util/mods/Mods.scala
 2014-08-02 19:49:53 +02:00
Florian Nücke
56eadb0458 Merge branch 'factorization' 2014-08-02 19:34:14 +02:00