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
3,459 Commits 29 Branches 143 Tags
Commit Graph

3459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
09332db963 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.6.4 into OC1.3-MC1.7.2 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/multipart/CablePart.scala
 2014-07-17 16:23:23 +02:00
Florian Nücke
738bcb5954 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.6.4 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
 2014-07-17 16:22:06 +02:00
Florian Nücke
20443f54e9 Fixes for the adjusted side checks. 2014-07-17 16:16:31 +02:00
Florian Nücke
83a79ad314 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.7.2 
Conflicts:
	src/main/java/li/cil/oc/common/asm/SimpleComponentTickHandler.java
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/renderer/block/BlockRenderer.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
 2014-07-17 16:07:26 +02:00
Florian Nücke
93218f4ff7 The Optional.Method annotation seems to not work in dev-env in some cases... trying to work around that to fix absence of FMP and Waila related crashes in dev-env. 2014-07-17 16:02:36 +02:00
Florian Nücke
b3813bc4f5 Trying to get rid of FMLCommonHandler.instance.getEffectiveSide where possible, since it can apparently fail in some scenarios. 2014-07-17 15:15:26 +02:00
Florian Nücke
11592e6b72 Minor refactoring. 2014-07-17 14:43:22 +02:00
Florian Nücke
b9e4f29267 Corrected link to Jenkins. 2014-07-17 13:39:12 +02:00
Florian Nücke
8f71f5cc26 Merge branch 'master' of github.com:MightyPirates/OpenComponents into MC1.7 2014-07-17 13:37:52 +02:00
Florian Nücke
de4858b18a Merge branch 'master' of github.com:MightyPirates/OpenComponents 2014-07-17 13:37:14 +02:00
Florian Nücke
405cc02c11 Added getter for base EU/t value for IC2 reactors, closes #19. 2014-07-17 13:37:02 +02:00
Florian Nücke
1cfd1cfb12 Adjusted for 1.7. 2014-07-16 21:33:05 +02:00
Florian Nücke
653e281ee4 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-16 21:30:16 +02:00
Florian Nücke
14ff4ce9d4 Added visual indicator for disks in disk drives (they 'stand out' a bit now). 2014-07-16 21:27:09 +02:00
Florian Nücke
9590cf54ae 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/client/gui/Switch.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Adapter.scala
	src/main/scala/li/cil/oc/common/block/Cable.scala
	src/main/scala/li/cil/oc/common/block/Capacitor.scala
	src/main/scala/li/cil/oc/common/block/Delegate.scala
	src/main/scala/li/cil/oc/common/block/Geolyzer.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/MotionSensor.scala
	src/main/scala/li/cil/oc/common/block/PowerConverter.scala
	src/main/scala/li/cil/oc/common/block/PowerDistributor.scala
	src/main/scala/li/cil/oc/common/block/Redstone.scala
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
	src/main/scala/li/cil/oc/common/inventory/ServerInventory.scala
	src/main/scala/li/cil/oc/common/item/Memory.scala
	src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/item/Terminal.scala
	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.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/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/RobotAssembler.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
	src/main/scala/li/cil/oc/server/PacketHandler.scala
 2014-07-16 19:02:26 +02:00
Florian Nücke
9964575414 Localized strings for switch GUI. 2014-07-16 18:38:01 +02:00
Florian Nücke
e0c22f0279 Potential fix for #409. 2014-07-16 18:21:55 +02:00
Florian Nücke
7149eeabc4 Fixed robots bouncing back network messages. 2014-07-16 18:05:18 +02:00
Florian Nücke
8cc4232424 Generified inventory name stuffs, will make this less conflict-prone with MC1.7 in the future. 2014-07-16 17:55:47 +02:00
Florian Nücke
4f289cd15f Getting rid of a crapton of redundant code. BEWARE: resulted in most textures being renamed! 2014-07-16 17:43:09 +02:00
Florian Nücke
07edd561c4 Pet rendering fixes. 2014-07-16 14:13:09 +02:00
Florian Nücke
f8d8b27dd0 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
	src/main/scala/li/cil/oc/util/mods/ComputerCraft.scala
 2014-07-15 19:18:19 +02:00
Florian Nücke
021a0bcd08 Synchronizing values for open switch GUI. 
Properly restoring upgraded values when loading.
 2014-07-15 18:59:16 +02:00
Florian Nücke
33a8f56d57 Added third upgrade type for switches (for packets / send cycle), using RAM for that, hard drives for queue size. 
Some more GUI ground work.
 2014-07-15 17:48:52 +02:00
Florian Nücke
8f572d2b6b Also updated localization keys from 'router' to 'switch'/'access point'. 2014-07-15 16:37:01 +02:00
Florian Nücke
828213ceb7 Some refactoring to get rid of the use of 'router' instead of 'switch' for consistency. 2014-07-15 16:24:40 +02:00
Florian Nücke
d4618e6d6d Merge branch 'master' of https://github.com/Kilobyte22/OpenComputers into switch-upgrades 2014-07-15 16:16:10 +02:00
Florian Nücke
8a5305ce3b Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-15 15:46:29 +02:00
Florian Nücke
4f73a83c76 Fixed aliases with arguments killing of actual arguments. 
Made cp more like real cp (at least the one that's on my Debian), adding alias 'cp -> cp -i' to compensate for the automatic overriding. Closes #384.
 2014-07-15 15:22:54 +02:00
Florian Nücke
1532b8a9a6 Adjusted IDs to not include additional 'oc' namespace to get rid of the startup warnings. Closes #402. 2014-07-15 13:10:28 +02:00
Florian Nücke
50e1fdd8fd Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-14 22:20:26 +02:00
Florian Nücke
88710b7b95 Should fix render glitches in screen GUI for inaccurate texture samplers. 2014-07-14 22:19:56 +02:00
Florian Nücke
c4430cceaa Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-14 21:02:34 +02:00
Florian Nücke
ae32a08b3c OCD! 2014-07-14 21:02:11 +02:00
Florian Nücke
d9d07f2ac2 Merge branch 'patch-3' of https://github.com/istasi/OpenComputers 2014-07-14 20:34:45 +02:00
Florian Nücke
92ff3892b5 Merge branch 'patch-2' of https://github.com/istasi/OpenComputers 2014-07-14 20:33:00 +02:00
Florian Nücke
60fb366cf1 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-14 20:26:20 +02:00
Florian Nücke
96b947c913 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-14 20:26:02 +02:00
Florian Nücke
6ff77e487f Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2.scala
 2014-07-14 20:25:08 +02:00
Florian Nücke
c1d5371738 Ugly workaround for IC2+Racks, closes #404. 2014-07-14 20:24:11 +02:00
istasi
bc080f3548 make openos perfer screens with keyboards attached. 2014-07-14 19:18:00 +02:00
istasi
1674dc537c Make boot loader prefer screens with keyboards attached 2014-07-14 19:15:47 +02:00
Florian Nücke
78af4577b4 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-14 18:31:46 +02:00
Florian Nücke
05a0211522 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-14 18:31:29 +02:00
Florian Nücke
25724a0127 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 2014-07-14 18:30:53 +02:00
Florian Nücke
d3028a33e9 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 2014-07-14 18:30:28 +02:00
Florian Nücke
9a3049ed84 Fixed the fix for getKeyboards(), gah. 2014-07-14 18:30:09 +02:00
Florian Nücke
713c7aeb45 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2014-07-14 18:03:25 +02:00
Florian Nücke
30eec9b385 Merge branch 'LuaJSucks' of https://github.com/gamax92/OpenComputers 2014-07-14 18:00:16 +02:00
Florian Nücke
4b1fb149db Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Conflicts:
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Adapter.scala
	src/main/scala/li/cil/oc/common/block/Cable.scala
	src/main/scala/li/cil/oc/common/block/Capacitor.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/Delegate.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/Geolyzer.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/Keyboard.scala
	src/main/scala/li/cil/oc/common/block/MotionSensor.scala
	src/main/scala/li/cil/oc/common/block/PowerConverter.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/RobotAfterimage.scala
	src/main/scala/li/cil/oc/common/block/RobotAssembler.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/item/ALU.scala
	src/main/scala/li/cil/oc/common/item/AbstractBusCard.scala
	src/main/scala/li/cil/oc/common/item/Acid.scala
	src/main/scala/li/cil/oc/common/item/Analyzer.scala
	src/main/scala/li/cil/oc/common/item/ArrowKeys.scala
	src/main/scala/li/cil/oc/common/item/ButtonGroup.scala
	src/main/scala/li/cil/oc/common/item/CPU.scala
	src/main/scala/li/cil/oc/common/item/CardBase.scala
	src/main/scala/li/cil/oc/common/item/CircuitBoard.scala
	src/main/scala/li/cil/oc/common/item/ControlUnit.scala
	src/main/scala/li/cil/oc/common/item/CuttingWire.scala
	src/main/scala/li/cil/oc/common/item/Delegate.scala
	src/main/scala/li/cil/oc/common/item/Disk.scala
	src/main/scala/li/cil/oc/common/item/FloppyDisk.scala
	src/main/scala/li/cil/oc/common/item/GraphicsCard.scala
	src/main/scala/li/cil/oc/common/item/HardDiskDrive.scala
	src/main/scala/li/cil/oc/common/item/InternetCard.scala
	src/main/scala/li/cil/oc/common/item/Interweb.scala
	src/main/scala/li/cil/oc/common/item/IronNugget.scala
	src/main/scala/li/cil/oc/common/item/LinkedCard.scala
	src/main/scala/li/cil/oc/common/item/Memory.scala
	src/main/scala/li/cil/oc/common/item/Microchip.scala
	src/main/scala/li/cil/oc/common/item/NetworkCard.scala
	src/main/scala/li/cil/oc/common/item/Numpad.scala
	src/main/scala/li/cil/oc/common/item/PrintedCircuitBoard.scala
	src/main/scala/li/cil/oc/common/item/RawCircuitBoard.scala
	src/main/scala/li/cil/oc/common/item/RedstoneCard.scala
	src/main/scala/li/cil/oc/common/item/Server.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/item/Terminal.scala
	src/main/scala/li/cil/oc/common/item/Transistor.scala
	src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala
	src/main/scala/li/cil/oc/common/item/UpgradeBattery.scala
	src/main/scala/li/cil/oc/common/item/UpgradeChunkloader.scala
	src/main/scala/li/cil/oc/common/item/UpgradeContainerCard.scala
	src/main/scala/li/cil/oc/common/item/UpgradeContainerUpgrade.scala
	src/main/scala/li/cil/oc/common/item/UpgradeCrafting.scala
	src/main/scala/li/cil/oc/common/item/UpgradeExperience.scala
	src/main/scala/li/cil/oc/common/item/UpgradeGenerator.scala
	src/main/scala/li/cil/oc/common/item/UpgradeInventory.scala
	src/main/scala/li/cil/oc/common/item/UpgradeInventoryController.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/UpgradeTractorBeam.scala
	src/main/scala/li/cil/oc/common/item/WirelessNetworkCard.scala
 2014-07-14 17:36:49 +02:00