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

1654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
2c029747b0 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-02 13:25:45 +02:00
Florian Nücke
3546e4a846 Fixed items being placeable in disabled container slots in robot inventory. 2014-06-02 13:25:25 +02:00
Florian Nücke
00ad80382d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-02 13:17:31 +02:00
Florian Nücke
faa314f790 Fixed AIOOB in robot inventory size computation. 2014-06-02 13:17:07 +02:00
Florian Nücke
b184c026dc Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-02 00:30:53 +02:00
Florian Nücke
07755515de Added support for recursive conversion (i.e. converters can push values that need to be converted again, such as item stacks) and support for pushing cyclic maps / lists. Closes #278. 2014-06-02 00:24:48 +02:00
Florian Nücke
b1291d2607 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-06-01 20:51:16 +02:00
Florian Nücke
6f3f9cc260 Fixes small creatures (e.g. chickens) taking damage standing on hologram projectors. Because the size was evil. Or something. I don't even. #lolwatminecraft 2014-06-01 20:50:53 +02:00
Florian Nücke
1743968924 Fixed Waila support for screens. 2014-06-01 20:30:20 +02:00
Florian Nücke
614ec30c4d Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/RobotAssembler.scala
	src/main/scala/li/cil/oc/client/gui/TextBuffer.scala
 2014-06-01 20:08:35 +02:00
Florian Nücke
83debc3288 Added warning icon when trying to type on a screen without a keyboard (mostly for robots). 2014-06-01 19:27:13 +02:00
Florian Nücke
403f1ffbd2 Showing reduced (screen-less) GUI for robots without screens built into them. 2014-06-01 18:20:11 +02:00
Florian Nücke
f9e1f6f1f5 Requiring a CPU and RAM in robot before allowing it to be assembled. 2014-06-01 17:32:07 +02:00
Florian Nücke
fed7f32ad7 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-05-31 16:46:29 +02:00
Florian Nücke
b3991c25ba Fixed http request persistence. 
Fixed repeated userdata persistence.
Fixed internet.request not blocking when no data was available.
 2014-05-31 16:46:04 +02:00
Florian Nücke
b4ac081000 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-05-31 02:54:18 +02:00
Florian Nücke
6174673447 Fixed items being replaced when used not being handled properly in robots (e.g. buckets), closes #279. 2014-05-31 02:51:40 +02:00
Florian Nücke
9fcd8abaaa Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 2014-05-31 02:02:15 +02:00
Florian Nücke
4c39ee547c Fixed screen resolution changes not being applied to the GUI without re-opening it. 2014-05-31 01:45:33 +02:00
Florian Nücke
006a99414a Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2014-05-31 01:28:05 +02:00
Florian Nücke
22d020004c Bind GPU to screen in kernel, to allow boot errors to show up on the screen before an OS binds it. 
Set resolution and depth to max in GPU's crash display (bluescreen).
 2014-05-31 01:02:42 +02:00
Florian Nücke
6ef0e5d26c Fixed case tier not being set when assembling robots (leading to always getting a tier 1 case when disassembling). 2014-05-31 00:38:48 +02:00
Florian Nücke
46394bcef1 Fixed breaking / unloading robots crashing on servers. 2014-05-31 00:29:39 +02:00
Florian Nücke
4e988a583c Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 2014-05-30 17:03:01 +02:00
Florian Nücke
1c115d9139 Some more fixes. 2014-05-30 17:00:22 +02:00
Florian Nücke
4df4d1dd98 Corrected name in @Optional.Interface for CC support in Router. 2014-05-30 16:21:17 +02:00
Florian Nücke
489179a361 Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/api/event/RobotRenderEvent.java
	src/main/scala/li/cil/oc/client/renderer/item/UpgradeRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
 2014-05-30 16:18:39 +02:00
Florian Nücke
06e0bda2d6 Finalized new robot upgrade rendering implementation. 
Added rendering for inventory upgrade.
 2014-05-30 16:07:15 +02:00
Florian Nücke
9f9e4d07ec Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 2014-05-29 21:33:02 +02:00
Florian Nücke
d3da20e150 Minor correction in JavaDoc. 2014-05-29 21:32:49 +02:00
Florian Nücke
b487bb1a9b Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/server/component/FileSystem.scala
	src/main/scala/li/cil/oc/server/component/NetworkCard.scala
 2014-05-29 20:36:26 +02:00
Florian Nücke
2eb41614c0 Avoid overshadowing imports. 2014-05-29 20:34:17 +02:00
Florian Nücke
14921160b7 Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 2014-05-29 19:07:49 +02:00
Florian Nücke
8540f2eed0 Fixed energy glitch in robots carried over from 1.2. 2014-05-29 19:07:33 +02:00
Florian Nücke
f3e46eb803 Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 2014-05-29 18:00:37 +02:00
Florian Nücke
fcc0dc85c3 Hide robots in creative tab. They have to be assembled to be useful. 2014-05-29 18:00:23 +02:00
Florian Nücke
566962936f Fixed a concurrent modification exception in robot copying. 2014-05-29 16:45:59 +02:00
Florian Nücke
8ba561aa02 Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/client/gui/Disassembler.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
 2014-05-29 16:19:11 +02:00
Florian Nücke
3459ff19a2 Nicer disassembler GUI with progress bar. 
Fixed power consumption in robot assembler and disassembler.
Tweaked energy consumption of the two a bit, too.
Made charger, assembler and disassembler accept power directly.
 2014-05-29 16:16:04 +02:00
Florian Nücke
177edc9bf6 Merge branch 'master' of C:\Users\fnuecke\Workspace\OpenComputers into MC1.7 
Conflicts:
	build.properties
	src/main/java/li/cil/oc/api/FileSystem.java
	src/main/java/li/cil/oc/api/detail/FileSystemAPI.java
	src/main/scala/li/cil/oc/Blocks.scala
	src/main/scala/li/cil/oc/Items.scala
	src/main/scala/li/cil/oc/Loot.scala
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/client/GuiHandler.scala
	src/main/scala/li/cil/oc/client/PacketHandler.scala
	src/main/scala/li/cil/oc/client/PacketSender.scala
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/Sound.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/client/gui/Case.scala
	src/main/scala/li/cil/oc/client/gui/DynamicGuiContainer.scala
	src/main/scala/li/cil/oc/client/gui/Icons.scala
	src/main/scala/li/cil/oc/client/gui/ImageButton.scala
	src/main/scala/li/cil/oc/client/gui/Robot.scala
	src/main/scala/li/cil/oc/client/gui/Server.scala
	src/main/scala/li/cil/oc/client/gui/TextBuffer.scala
	src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/gui/BufferRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/item/UpgradeRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/PowerDistributorRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/ScreenRenderer.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/Sound.scala
	src/main/scala/li/cil/oc/common/block/Charger.scala
	src/main/scala/li/cil/oc/common/block/Delegator.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/PowerDistributor.scala
	src/main/scala/li/cil/oc/common/block/Rack.scala
	src/main/scala/li/cil/oc/common/block/Redstone.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/block/Switch.scala
	src/main/scala/li/cil/oc/common/component/Terminal.scala
	src/main/scala/li/cil/oc/common/inventory/ComponentInventory.scala
	src/main/scala/li/cil/oc/common/item/Delegate.scala
	src/main/scala/li/cil/oc/common/item/GraphicsCard.scala
	src/main/scala/li/cil/oc/common/item/InternetCard.scala
	src/main/scala/li/cil/oc/common/item/NetworkCard.scala
	src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
	src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala
	src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala
	src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala
	src/main/scala/li/cil/oc/common/item/UpgradeNavigation.scala
	src/main/scala/li/cil/oc/common/item/UpgradeSign.scala
	src/main/scala/li/cil/oc/common/item/UpgradeSolarGenerator.scala
	src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
	src/main/scala/li/cil/oc/common/multipart/EventHandler.scala
	src/main/scala/li/cil/oc/common/multipart/MultiPart.scala
	src/main/scala/li/cil/oc/common/recipe/Recipes.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/Case.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/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/Screen.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
	src/main/scala/li/cil/oc/server/TickHandler.scala
	src/main/scala/li/cil/oc/server/component/FileSystem.scala
	src/main/scala/li/cil/oc/server/component/NetworkCard.scala
	src/main/scala/li/cil/oc/server/component/Redstone.scala
	src/main/scala/li/cil/oc/server/component/Server.scala
	src/main/scala/li/cil/oc/server/component/UpgradeSign.scala
	src/main/scala/li/cil/oc/server/component/machine/Machine.scala
	src/main/scala/li/cil/oc/server/component/robot/Robot.scala
	src/main/scala/li/cil/oc/server/driver/CompoundBlockDriver.scala
	src/main/scala/li/cil/oc/server/driver/item/CC15Media.scala
	src/main/scala/li/cil/oc/server/driver/item/ComputerCraftMedia.scala
	src/main/scala/li/cil/oc/server/driver/item/RedstoneCard.scala
	src/main/scala/li/cil/oc/server/fs/FileSystem.scala
	src/main/scala/li/cil/oc/util/ExtendedNBT.scala
	src/main/scala/li/cil/oc/util/TextBuffer.scala
	src/main/scala/li/cil/oc/util/mods/ComputerCraft15.scala
	src/main/scala/li/cil/oc/util/mods/ComputerCraft16.scala
 2014-05-29 13:26:15 +02:00
Florian Nücke
96243ddfc2 Defaulting to OpenOS for loot disks (avoids empty disks if stack is copied directly instead of via the generateChestContent method). 2014-05-28 16:29:17 +02:00
Florian Nücke
137204dea1 Retry setting primaries automatically, mainly to avoid confusion when creation was impossible due to lack of memory. 2014-05-28 16:27:27 +02:00
Florian Nücke
e04d497fe9 Fixed incorrect check leading to components not always being properly initialized before sent to clients. 
Exposing finishConnect on internet card for those who think they need it.
 2014-05-28 16:01:57 +02:00
Florian Nücke
a33df79f4f Some fixes and improvements to userdata handling. 
- Ensure to check for userdata in tables.
- Using local table to track userdata by proxy, allowing the use of metatables reducing the memory consumption.
- Ensure to re-use proxies to avoid duplication across save/load and proper behavior for `==`.
 2014-05-28 15:12:49 +02:00
Florian Nücke
1ddb6841dd Removed type from the 'fromComputerCraft' factory methods in the FileSystem API to remove the dependency on the CC API. 2014-05-28 13:13:05 +02:00
Florian Nücke
81268ac186 Made text buffer render callback return whether the contents changed since last call, using that to force update screen GUI size when necessary. 2014-05-28 01:38:19 +02:00
Florian Nücke
a2182c7d8e Merge branch 'master' of github.com:MightyPirates/OpenComputers into one-three 
Conflicts:
	build.properties
 2014-05-27 22:43:43 +02:00
Florian Nücke
d9cef2b414 Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7 
Conflicts:
	build.properties
 2014-05-27 21:20:19 +02:00
Florian Nücke
82be46c7b8 Fixed the fix... v1.2.12 2014-05-27 21:19:18 +02:00
Florian Nücke
3fd5fb0944 Instead of two separate methods, introduced Container interface that's passed to item drivers for environment creation. 
Also used in the FileSystem.asManagedEnvironment methods now.
 2014-05-27 17:42:24 +02:00