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

2373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Florian Nücke
d5012a6873 Added IC2 classic power support. 
Switched things around a bit, power traits don't implement their interfaces by default now, instead they get injected by the class transformer if the power mod is present to avoid class not found errors in conjunction with interface stripping seemingly getting confused by Scala's synthetic classes.
 2014-08-02 19:32:45 +02:00
Anton
873b933821 Update ru_RU.lang 2014-08-02 19:28:34 +04:00
Florian Nücke
1538fb2586 Made Factorization power actually work, tweaked value a little, added to power converter tooltip. 2014-08-02 17:23:30 +02:00
Florian Nücke
5d38ec8369 Messing around with the Factorization API. 2014-08-02 16:08:30 +02:00
Florian Nücke
1ec141403a Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-02 15:02:33 +02:00
Florian Nücke
18eb77080d Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-02 15:02:26 +02:00
Florian Nücke
c7d6a6f145 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-08-02 15:01:52 +02:00
Florian Nücke
d77da6698f Fixed non-flipped color value being sent to clients in hologram.setPaletteColor(), leading to wrong display until reloading. 2014-08-02 15:01:35 +02:00
Florian Nücke
ebad9911ed Fixed disk / floppy access sounds ignoring OC specific volume setting from config. 2014-08-02 14:36:42 +02:00
Florian Nücke
c78405ecf2 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/SaveHandler.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
 2014-08-02 14:24:13 +02:00
Florian Nücke
97fdf51553 Externalized text buffer storage. This will hopefully avoid #443, will need long-term testing. 2014-08-02 14:18:58 +02:00
Florian Nücke
beb33d4819 Moved some more logic to save handler and removed old compatibility code from save/load logic in machines (they'd be reset by now anyway due to API changes). 2014-08-02 13:34:53 +02:00
Florian Nücke
45f29b33e0 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-02 13:07:01 +02:00
Florian Nücke
e008949c7b Lower chunkloader cost default value as discussed, closes #447. 2014-08-02 13:06:19 +02:00
Florian Nücke
5c853ea1c0 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-01 18:22:27 +02:00
Florian Nücke
53d986312e Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-01 18:22:14 +02:00
Florian Nücke
82c60ed86d Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/resources/assets/opencomputers/lang/de_DE.lang
	src/main/resources/assets/opencomputers/lang/en_US.lang
 2014-08-01 18:21:54 +02:00
Florian Nücke
84b0abb4bf Fixed side check for server racks in internal switch mode. 2014-08-01 18:20:48 +02:00
Florian Nücke
3665e26b9f Fixed mouse scrolling working on tier one screens. 2014-08-01 17:12:36 +02:00
Florian Nücke
9be4a6dff3 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-01 16:15:09 +02:00
Florian Nücke
8eb5a95cac Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-08-01 16:14:51 +02:00
Florian Nücke
4987b9702d Checking for RedstoneFlux API instead of TE now, closes #455. 2014-08-01 16:14:08 +02:00
Florian Nücke
9602576678 Updated list of supported mods in info message that's displayed when no power providing mods are present. 2014-08-01 15:33:35 +02:00
Florian Nücke
bb89fd3245 Added check for ELN in power mods to avoid going into no-power mode if ELN is the only power providing mod. 
Updated list of supported mods in info message that's displayed when no power providing mods are present.
 2014-08-01 15:33:18 +02:00
Florian Nücke
9c3e7006a4 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-08-01 00:10:19 +02:00
Florian Nücke
9b2d201c6e Re-enabled tablets in dev branch (merging patches disabled it, gah). 2014-08-01 00:10:00 +02:00
Florian Nücke
56bf3e0c4a Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-31 19:19:54 +02:00
Florian Nücke
a4479619ad Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-31 19:18:22 +02:00
Florian Nücke
29ea616285 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-31 19:17:46 +02:00