Florian Nücke
e69d0f2643
Merge branch 'OC1.6-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9
2016-06-06 23:39:35 +02:00
Florian Nücke
7892ea07f7
Merge branch 'master-MC1.8.9' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.8.9
2016-06-06 23:39:18 +02:00
Florian Nücke
a2e25f9cdb
Beta 2. Yep, back to beta.
2016-06-06 23:38:44 +02:00
Florian Nücke
61ad3b47cc
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into OC1.6-MC1.7.10
2016-06-06 23:37:51 +02:00
Florian Nücke
c98dd518c2
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-06-06 23:36:03 +02:00
Florian Nücke
2874f4720a
Added IMC message to notify OC of a 3rd party power system. Closes #1784 .
2016-06-06 20:52:54 +02:00
Florian Nücke
ea845ac8dc
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-06-06 20:20:21 +02:00
Florian "Sangar" Nücke
37249142af
Merge pull request #1836 from LizzyTrickster/patch-5
...
link update
2016-06-06 20:13:50 +02:00
Florian Nücke
d931f19007
Added saveConfiguration to manual.
2016-06-06 20:12:58 +02:00
Florian Nücke
dda0900897
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-06-05 11:05:36 +02:00
Florian Nücke
8da15681bf
Fixed CPU and memory not being neighbor only visible.
...
Fixed tier numbers being used 0-indexed in device info texts.
Fixed machine hosts' device info not being exposed.
2016-06-05 11:04:06 +02:00
Florian Nücke
735ed6b271
For example indeed...
2016-06-04 16:11:42 +02:00
Florian Nücke
8ad233d037
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-06-04 13:55:47 +02:00
Florian Nücke
4626e1ca8e
Moved attribute and class constants into API.
2016-06-04 13:55:22 +02:00
Florian Nücke
ef81b302bf
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-06-04 02:13:53 +02:00
Florian Nücke
9fb8ad57f9
Avoid herpderps.
2016-06-04 02:13:31 +02:00
Florian Nücke
9f9ee783cc
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
# src/main/scala/li/cil/oc/common/tileentity/Assembler.scala
# src/main/scala/li/cil/oc/common/tileentity/Case.scala
# src/main/scala/li/cil/oc/common/tileentity/Charger.scala
# src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
# src/main/scala/li/cil/oc/common/tileentity/DiskDrive.scala
# src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
# src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
# src/main/scala/li/cil/oc/common/tileentity/MotionSensor.scala
# src/main/scala/li/cil/oc/common/tileentity/PowerConverter.scala
# src/main/scala/li/cil/oc/common/tileentity/Printer.scala
# src/main/scala/li/cil/oc/server/component/DiskDriveMountable.scala
# src/main/scala/li/cil/oc/server/component/InternetCard.scala
# src/main/scala/li/cil/oc/server/component/LinkedCard.scala
# src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
# src/main/scala/li/cil/oc/server/component/Server.scala
# src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
# src/main/scala/li/cil/oc/server/component/UpgradeLeash.scala
# src/main/scala/li/cil/oc/server/component/UpgradePiston.scala
# src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
# src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala
# src/main/scala/li/cil/oc/server/component/WirelessNetworkCard.scala
2016-06-04 01:59:48 +02:00
Florian Nücke
8531c22106
Added DeviceInfo API, allows environments to provide basic information even when they do not expose a component. Made available via computer.getDeviceInfo().
...
Must be implemented on Environments. Queried on environments of nodes reachable / visible (when a component / not) from a machine.
Added very *very* basic program for listing device info from shell, `lshw`.
2016-06-04 01:46:21 +02:00
Florian Nücke
305181874e
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-30 20:54:34 +02:00
Florian Nücke
aa546dfce5
I think this should work. Closes #1839 .
2016-05-30 20:46:53 +02:00
Florian Nücke
9acb5eb26f
Should fix tablet disassembly ignoring upgrade container, closes #1838 .
2016-05-30 20:36:37 +02:00
Florian Nücke
06792b0d66
Allow components to expose capabilities. This is completely untested...
2016-05-29 15:39:15 +02:00
Lizzy
533e7443e8
link update
2016-05-28 19:15:01 +01:00
Florian Nücke
1daebe4b99
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-28 20:01:51 +02:00
payonel
ce77d77baf
tab complete fix where whitespace after redirection would not be trimmed
2016-05-28 10:19:13 -07:00
Florian Nücke
7524e6877e
Hopefully fixes color of rendered text bleeding into other tile entity renderers.
2016-05-28 11:59:49 +02:00
Florian Nücke
31d7ac77d6
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-27 23:54:45 +02:00
Florian Nücke
027b0c2069
Fixed rotatables not getting their onRotationChanged notification when using block state based rotation. Closes #1826 .
2016-05-27 23:52:27 +02:00
Florian Nücke
7ab37217b0
Well that certainly was a fascinating derp to track down.
2016-05-27 23:37:05 +02:00
Florian Nücke
3a99e30f40
Fix tile entity renderers turning other stuff transparent (yay no push/popAttrib .-.)
2016-05-27 18:00:24 +02:00
Florian Nücke
080240846e
Also disable JEI recipe handler when loot cycling is disabled.
2016-05-27 16:52:55 +02:00
Florian Nücke
e01e06a8bd
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-27 16:51:31 +02:00
Florian Nücke
5964911a80
Allow disabling loot disk cycling via config as per special request :P
2016-05-27 16:51:06 +02:00
Florian Nücke
632f5b7ddb
Underp ticking.
2016-05-27 16:45:56 +02:00
Florian Nücke
f1c1c064ae
What do you mean, access to client classes on a server? :P
2016-05-27 16:14:31 +02:00
Florian Nücke
030ebb518d
This is way more weird than I thought...
2016-05-27 15:27:14 +02:00
Florian Nücke
ae92c73a91
Why IntelliJ, whyyyy? D:
2016-05-27 15:11:57 +02:00
Florian Nücke
ba59e9493f
JEI integration for loot disk recrafting (more or less :P).
2016-05-27 15:07:28 +02:00
Florian Nücke
b03ce8bf3d
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-27 14:34:48 +02:00
Florian Nücke
0990c09274
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
...
# Conflicts:
# src/main/scala/li/cil/oc/common/Loot.scala
# src/main/scala/li/cil/oc/common/recipe/Recipes.scala
# src/main/scala/li/cil/oc/server/component/InternetCard.scala
2016-05-27 14:34:37 +02:00
Florian Nücke
4737520b6a
Recipe sorting.
2016-05-27 14:34:08 +02:00
Florian Nücke
896bfa2728
Cleanup.
2016-05-27 13:43:15 +02:00
Florian Nücke
b50d3872ee
Moved all the things! Renamed all the things! Broke all the things!
...
Made most component ROMs into loot disks (except robot for hopefully obvious reasons).
Changed loot disk naming convention (this will break existing loot disks). Closes #1456 .
Made all loot disks craftable by cycling through them by crafting one with a wrench (so e.g. craft OpenOS then cycle through).
2016-05-27 13:33:22 +02:00
Florian Nücke
7eca6c1a10
Fix lighting issues with print preview in 3d printer.
2016-05-26 19:57:30 +02:00
Florian Nücke
ea37f4db67
Not all things must tick.
2016-05-26 17:34:37 +02:00
Florian Nücke
726aa36164
Wrap push/popAttrib, don't for now, since it breaks the GlStateManager.
2016-05-26 11:54:53 +02:00
Florian Nücke
41f51337b0
Porting.
2016-05-25 18:34:01 +02:00
Florian Nücke
bc1107e5cb
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-25 18:33:33 +02:00
Florian Nücke
6e271c79d8
Update player last active time to avoid AFK kicks while working in screens e.g. Closes #1811 .
2016-05-25 18:33:15 +02:00
Florian Nücke
fa226ab118
Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8.9
2016-05-25 18:17:14 +02:00
