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 |
|
Florian Nücke
|
c17334f27f
|
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
Conflicts:
build.properties
src/main/scala/li/cil/oc/client/renderer/TextBufferRenderCache.scala
src/main/scala/li/cil/oc/common/Loot.scala
src/main/scala/li/cil/oc/common/item/Delegator.scala
src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
src/main/scala/li/cil/oc/common/recipe/Recipes.scala
src/main/scala/li/cil/oc/util/TextBuffer.scala
|
2014-07-14 17:25:33 +02:00 |
|
Florian Nücke
|
2cde13b7bd
|
A little late, but a type alias for Icon and IconRegister to make porting items and blocks to 1.7 easier from here on out.
|
2014-07-14 17:19:30 +02:00 |
|
Florian Nücke
|
ae2d284996
|
Added setting to allow forcing use of old font renderer.
|
2014-07-14 15:20:21 +02:00 |
|
Florian Nücke
|
19d1edfbe7
|
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
Conflicts:
build.properties
|
2014-07-14 14:10:45 +02:00 |
|
Florian Nücke
|
f0f4a699e1
|
Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10
Conflicts:
build.properties
|
2014-07-14 14:09:46 +02:00 |
|
Florian Nücke
|
fa4413fd56
|
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2
Conflicts:
build.properties
|
2014-07-14 14:09:07 +02:00 |
|
Florian Nücke
|
e7d64fa6d0
|
Version bump.
v1.3.1
|
2014-07-14 14:08:12 +02:00 |
|
Florian Nücke
|
99536f5217
|
Fixed text centering in robot GUI's screen.
|
2014-07-14 14:05:01 +02:00 |
|
Florian Nücke
|
f3b7b41b9f
|
Merge branch 'patch-8' of https://github.com/Vexatos/OpenComputers
|
2014-07-14 13:43:44 +02:00 |
|
gamax92
|
de254def91
|
Reformat LuaJ
Rather sick of this inconstistent (and overly spaced) formatting
Even if it makes certain parts worse, having it all constistent will be
helpful.
|
2014-07-13 21:49:18 -06:00 |
|
gamax92
|
d070d5231c
|
Various fixes
|
2014-07-13 21:14:37 -06:00 |
|
Florian Nücke
|
984123efdc
|
Merge branch 'master' of github.com:MightyPirates/OpenComputers
|
2014-07-14 00:18:07 +02:00 |
|
Florian Nücke
|
70690110c2
|
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers
|
2014-07-14 00:17:43 +02:00 |
|
Florian Nücke
|
e99dce8a1f
|
Adjusted for 1.7.10.
|
2014-07-14 00:15:09 +02:00 |
|
Florian Nücke
|
f48bbc79ec
|
Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10
|
2014-07-14 00:14:35 +02:00 |
|
Florian Nücke
|
9ebc60d9f4
|
Made fake player profile "complete" to avoid it not working on dedicated servers (even though partial profiles seem to be something that should be used for this, but hey...)
|
2014-07-14 00:13:27 +02:00 |
|
Florian Nücke
|
b4bb25f066
|
Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10
|
2014-07-13 23:54:02 +02:00 |
|
Florian Nücke
|
586aef4538
|
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2
|
2014-07-13 23:52:22 +02:00 |
|
Florian Nücke
|
9cb9efd940
|
Merge pull request #399 from gamax92/LuaJSucks
Fix math.random in LuaJ.
|
2014-07-13 23:20:00 +02:00 |
|
Florian Nücke
|
0321a7816c
|
Fixed math.random, closes #400.
|
2014-07-13 23:19:15 +02:00 |
|
gamax92
|
56221d04fd
|
Use doubles instead of long
|
2014-07-13 12:20:21 -06:00 |
|
Vexatos
|
aeae1244f4
|
Update go.lua
|
2014-07-13 20:00:15 +02:00 |
|
gamax92
|
0d65552442
|
Fix math.random
|
2014-07-13 11:56:54 -06:00 |
|
Vexatos
|
f7603f9a8a
|
Create go.lua
|
2014-07-13 19:29:25 +02:00 |
|
Florian Nücke
|
3224d6af44
|
Updated to forge recommended and updated IC2 API (and using their maven now).
|
2014-07-13 14:43:00 +02:00 |
|
Florian Nücke
|
36eb26eedd
|
Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10
|
2014-07-12 23:05:44 +02:00 |
|
Florian Nücke
|
289ee04c13
|
Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2
|
2014-07-12 23:04:50 +02:00 |
|
Florian Nücke
|
da5f2590aa
|
Shuffling lib load order a bit to see if it avoids the arm lib being sorta-kinda loaded on non-arm Linux.
|
2014-07-12 23:04:15 +02:00 |
|
Florian Nücke
|
d84a899d4e
|
Fix wide char loading in TextBuffer.
|
2014-07-12 20:53:11 +02:00 |
|
Florian Nücke
|
3ba9854c2e
|
At least it's not breaking for normal stuff.
|
2014-07-12 18:38:07 +02:00 |
|
Florian Nücke
|
022becaea0
|
Little bit of refactoring, term.write is sorta kinda supporting wide chars now.
|
2014-07-12 17:06:08 +02:00 |
|
Florian Nücke
|
f348a8013e
|
Making char width checks in unicode lib available to sandbox.
|
2014-07-12 14:30:36 +02:00 |
|
Florian Nücke
|
2bfd15ad2e
|
Cleaning up a bit and getting rid of an unnecessary copy step.
|
2014-07-12 14:15:55 +02:00 |
|
Florian Nücke
|
1ef1c9ce00
|
Got the basics working.
|
2014-07-12 13:50:32 +02:00 |
|
Florian Nücke
|
f522f83781
|
Adding in @asiekierka's contributions of unifont and parser for #41.
|
2014-07-12 12:56:53 +02:00 |
|
Florian Nücke
|
c172462540
|
Forgotted to save colored floppy raws.
|
2014-07-12 03:23:52 +02:00 |
|