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

3674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
c52959258d Gradle 2. 2015-01-12 07:44:17 +01:00
Florian Nücke
c88eac9d61 Nothing to see here, please keep moving right along. 2015-01-12 04:31:34 +01:00
Florian Nücke
61b26e17cb Added backwards compatibility to inventory_controller.getStackInSlot, closes #803. 2015-01-12 03:31:10 +01:00
Florian Nücke
bce4a60394 Fixed drones with an active leash causing leash items to be dropped when picked up (shift-rightclicked). 
Fixed leash on drones not rendering centered on drone in obfed Minecraft.
 2015-01-12 03:18:23 +01:00
Florian Nücke
5239eb3ab0 Fixed potential NPE in Waila handler. 2015-01-11 23:35:14 +01:00
Florian Nücke
7cfa7ac2a3 Missed one. 2015-01-11 16:38:19 +01:00
Florian Nücke
d03c7c94e6 Added Waila options for toggling energy, address and component name. 2015-01-11 16:17:33 +01:00
Florian Nücke
7bbed622f9 Coloring tooltips of devices according to their tier now (robots, mcus, drones). 
Added creative drone and mcu case.
Added preconfigured robot, mcu and drone to creative tab (mcu and drone still need a programmed EEPROM to be put in).
 2015-01-11 16:01:35 +01:00
Florian Nücke
b13f319018 Added EEPROM cloning recipe (EEPROM + EEPROM -> 2x EEPROM with same data). If one is empty, the one with data is preferred. If both have data, the first one gets copied onto the second. Closes #756. 2015-01-11 14:27:29 +01:00
Florian Nücke
6bb2233cb8 Added debug.connectToBlock, allowing debug cards to connect their local network to a remote block. Closes #751, closes #475. 2015-01-11 14:08:55 +01:00
Florian Nücke
2b68ee8dbd Added eeprom.getSize, eeprom.getChecksum and eeprom.makeReadonly(checksum). Closes #792. 2015-01-11 13:25:48 +01:00
Florian Nücke
d091efc775 Added keyboard to list of recommended components in tablet. 2015-01-11 03:56:50 +01:00
Florian Nücke
d01616dce5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/integration/nei/NEIOpenComputersConfig.scala
	src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
	src/main/scala/li/cil/oc/integration/util/NEI.scala
 2015-01-11 03:52:56 +01:00
Florian Nücke
5311ebff70 Fixed EEPROM being network visible. 2015-01-11 03:37:12 +01:00
Florian Nücke
79f3c7156c Cleaned up legacy text buffer packet sending / handling code. Also fixed synching max res. 2015-01-11 02:24:52 +01:00
Florian Nücke
1ab0698ceb Version bumpery. 2015-01-11 01:57:19 +01:00
Florian Nücke
0d1612c54d Fixed NEI block hiding derp. 2015-01-11 01:56:15 +01:00
Florian Nücke
c768f931ae Being a bit more open to underlying types other architectures may provide as arguments. Should fix #797. 2015-01-11 01:31:47 +01:00
Florian Nücke
38c5f41069 Merge branch 'patch-2' of https://github.com/SoniEx2/OpenComputers into master-MC1.7.10 2015-01-11 01:11:03 +01:00
Florian Nücke
082326ed4b Synching max res of screens to clients, for cases where it is set to something exceeding the default legal max size of the buffer (addons). 2015-01-11 01:04:43 +01:00
Florian Nücke
a16b042bc0 Server transition woes. 2015-01-11 00:17:13 +01:00
Florian Nücke
6d09841652 Fixed EEPROM component proxy being fetched too early when flashing, fixes #796. 2015-01-10 22:41:35 +01:00
Florian Nücke
8e935a6950 Fixed NPE in AE2 controller driver usage screen when AE2 channels are disabled. Closes #793. 2015-01-10 22:41:22 +01:00
Florian Nücke
d7d62254b3 Fixed inventory slot offset for tank controller upgrade. 
Fixed drain and fill not always returning the amount transferred.
 2015-01-10 22:41:00 +01:00
Florian Nücke
8cf4443a6a Cleaned up block renderer some more. 2015-01-09 16:20:41 +01:00
Florian Nücke
95c9f2349c Updating computer case metadata when running state changes. 2015-01-09 15:04:40 +01:00
Florian Nücke
3d3732e573 Cable rendering \o/ 
Fixed screen rendering in third-person.
 2015-01-09 00:40:52 +01:00
Florian Nücke
31191408f2 "Renaming shit means breaking shit." - Winston Churchill 2015-01-08 16:12:23 +01:00
Florian Nücke
789c8b600d Fixed inventories not dropping their contents when broken. 2015-01-08 15:49:33 +01:00
Florian Nücke
75e19824a3 Fixed screen and case tint in inventory. 2015-01-08 15:43:38 +01:00
Florian Nücke
c8e975f19a Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/java/li/cil/oc/api/API.java
	src/main/java/li/cil/oc/api/internal/Drone.java
	src/main/java/li/cil/oc/api/internal/Robot.java
	src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
	src/main/scala/li/cil/oc/common/block/Case.scala
	src/main/scala/li/cil/oc/common/block/Charger.scala
	src/main/scala/li/cil/oc/common/block/Disassembler.scala
	src/main/scala/li/cil/oc/common/block/DiskDrive.scala
	src/main/scala/li/cil/oc/common/block/Microcontroller.scala
	src/main/scala/li/cil/oc/common/block/Raid.scala
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
	src/main/scala/li/cil/oc/common/entity/Drone.scala
	src/main/scala/li/cil/oc/common/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/item/Delegate.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/Assembler.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/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/AbstractBusAware.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/integration/stargatetech2/AbstractBusCard.scala
	src/main/scala/li/cil/oc/server/component/UpgradeTractorBeam.scala
	src/main/scala/li/cil/oc/util/ItemUtils.scala
	src/main/scala/li/cil/oc/util/ScalaEnum.scala
 2015-01-08 14:56:27 +01:00
Florian Nücke
64f853d95e Fixed icons for subitems with damage bar. 
GUI rendering fixes.
 2015-01-08 14:20:42 +01:00
Florian Nücke
17790ea156 Cleaned up screen renderer some. 
Made cases tint properly.
Fixed server rack block overlay.
 2015-01-08 12:46:26 +01:00
Florian Nücke
c760503aec So I may have been a little too paranoid about gpu/screens' bandwidth usage. 2015-01-08 01:43:08 +01:00
Florian Nücke
2c6f0ee181 Added code to handle merges of networks containing nodes with identical addresses. Should do the trick for #790, needs confirmation. 2015-01-07 13:32:23 +01:00
Florian Nücke
2852ba1591 Added internal.Tiered interface, implementing in most tiered things: screens, computer cases, microcontrollers, robots and drones. Closes #789. 2015-01-07 13:12:36 +01:00
Florian Nücke
135472ea79 Made drone implement Context to make some components work properly (e.g. Chunkloader upgrade). 2015-01-05 23:36:14 +01:00
Florian Nücke
9b4298c695 Keeping relative target position for drones when travling to a different dimension, closes #784. 2015-01-05 23:09:29 +01:00
Florian Nücke
27660d6d18 Brought a bit more structure into flash.lua. 2015-01-05 23:05:40 +01:00
Florian Nücke
ca02d428fb Merge branch 'master-MC1.7.10' of https://github.com/skyem123/OpenComputers into master-MC1.7.10 2015-01-05 22:56:27 +01:00
Florian "Sangar" Nücke
6e4c617b70 Merge pull request #787 from magik6k/master 
Fixed quiet mode in opl-flash
 2015-01-05 22:55:23 +01:00
Florian Nücke
c738f0f5c1 Fixed charger not notifying its neighbors when changing its charging state (needed for comparators to update correctly). 
Fixed drone showing up in NEI (pointless as it has to be built in assembler to work, so better to hide it like robots).
 2015-01-05 22:49:01 +01:00
Florian Nücke
0deb955b4a Implemented BC's IHasWork on a couple of blocks as discussed in #782. 
Also unified comparator logic with the new system (with a few exceptions, such as disk drive and raid).
Fixed raid's comparator output.
Fixed disassembler accepting items it shouldn't.
 2015-01-05 22:32:43 +01:00
Florian Nücke
c95196df0e Unified tooltips of items with builtin components a little. 2015-01-05 22:14:04 +01:00
Florian Nücke
b5183fb2d0 Fixed error in Waila handler when called with empty NBT data. 2015-01-05 22:13:21 +01:00
Florian Nücke
39fa8d9535 Fixed disassembler nomnoming robots. Closes #786. 2015-01-05 20:42:05 +01:00
Łukasz Magiera
3bcb889d8a Fixed quiet mode in opl-flash 2015-01-05 18:55:24 +01:00
Skye
ebb7ae5038 Fixed a typo in flash.lua 
"Are you want to overwrite?"
 2015-01-05 17:15:22 +00:00
Skye
d9cfdfa5d7 Add ability to save current EEPROM to file in flash.lua 2015-01-05 14:50:48 +00:00
Florian Nücke
5d3879d0a4 okthen 2015-01-04 15:54:42 +01:00