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

1792 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
cb0e51efbb Properly erroring for invalid indexes in gpu.get now and (probably?) fixing a bug in term.isWide. 2014-07-20 19:02:33 +02:00
Florian Nücke
ef9506fd82 Meh. 2014-07-20 17:34:45 +02:00
Florian Nücke
78957853ef Adjusted robot GUI for new font renderer's char aspect ratio (auto-sizes now). 
Extracted the commonly used progress bar code into a common class.
 2014-07-20 17:22:25 +02:00
Florian Nücke
114b232e9a Fixed texture names. 2014-07-19 22:44:20 +02:00
Florian Nücke
9009c73398 Fixes that don't fix anything. 2014-07-19 22:35:57 +02:00
Florian Nücke
72e47bc7c2 Mod ids as constants instead of strings all over the place. 2014-07-19 17:42:14 +02:00
Florian Nücke
672d9d6b83 Merge branch 'master' of github.com:MightyPirates/OpenComputers 2014-07-19 13:58:29 +02:00
Florian Nücke
14d79b9456 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 
Conflicts:
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Hologram.scala
	src/main/scala/li/cil/oc/common/block/Redstone.scala
	src/main/scala/li/cil/oc/common/block/Screen.scala
	src/main/scala/li/cil/oc/common/block/ServerRack.scala
	src/main/scala/li/cil/oc/common/block/Switch.scala
	src/main/scala/li/cil/oc/common/recipe/ExtendedRecipe.scala
	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
 2014-07-19 13:58:08 +02:00
Florian Nücke
da8b6c55aa Compiler fun! 2014-07-19 13:47:30 +02:00
Florian Nücke
9d49a98db7 Some cleanup. 2014-07-19 13:37:02 +02:00
Florian Nücke
5f19433ba8 Centralizing use of sided checks to make it easier to swap out for testing in the future, and added some hackiness to maybe make it more stable. 2014-07-19 13:29:45 +02:00
Florian Nücke
fe4444dacc Revert "Trying to get rid of FMLCommonHandler.instance.getEffectiveSide where possible, since it can apparently fail in some scenarios." 
This reverts commit b3813bc4f563a4066fd79db1dad16db3673bb324.

And a few more related commits. Turns out this was caused by some Bukkit plugin, tho it is still unknown which one exactly.

Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
	src/main/scala/li/cil/oc/common/component/TextBuffer.scala
 2014-07-19 13:17:33 +02:00
Florian Nücke
b56f6576fb Merge pull request #418 from Vexatos/patch-9 
Update oppm.lua
 2014-07-19 12:37:42 +02:00
Vexatos
86c580ad58 Update oppm.lua 2014-07-19 11:26:44 +02:00
Florian Nücke
23be2a7ebd Cleaned up components.lua a little and allowing to specify multiple filters (each argument is used as filter) and only printing methods for -l. 2014-07-18 13:06:41 +02:00
istasi
bad2f94ca0 Update components.lua 2014-07-17 23:43:39 +02:00
Florian Nücke
1004c9572b Fixed a potential issue when new characters were loaded into the font lookup-texture and the char is a wide char that doesn't fit into the last row of the texture. 
It would have been rendered 'outside' the texture, leading to the char being incorrectly displayed. Now checking for this case, too, and creating new texture instead.
 2014-07-17 18:06:41 +02:00
Florian Nücke
3dd3eed915 Removed more stuff from new font renderer that's no longer needed. 2014-07-17 18:00:29 +02:00
Florian Nücke
35116c26cb Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-17 17:52:41 +02:00
Florian Nücke
15125cc4b6 More mysterious NPEs! 2014-07-17 17:51:34 +02:00
Florian Nücke
ca5b3805ba Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-17 17:09:16 +02:00
Florian Nücke
81bdce12be Fix potential NPE. 2014-07-17 17:07:53 +02:00
Florian Nücke
e8eb3a4453 Updated for the side check change. 2014-07-17 17:03:13 +02:00
Florian Nücke
ef0034742c Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-17 17:02:57 +02:00
Florian Nücke
78c6d01051 Fix for version injection into config after file name change. 2014-07-17 17:01:27 +02:00
Florian Nücke
e054012e1b Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.6.4 
Conflicts:
	src/main/scala/li/cil/oc/common/block/AccessPoint.scala
	src/main/scala/li/cil/oc/common/block/Hologram.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/block/Switch.scala
	src/main/scala/li/cil/oc/common/tileentity/AccessPoint.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/Switch.scala
 2014-07-17 16:30:09 +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
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
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
9964575414 Localized strings for switch GUI. 2014-07-16 18:38:01 +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
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
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
88710b7b95 Should fix render glitches in screen GUI for inaccurate texture samplers. 2014-07-14 22:19:56 +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
96b947c913 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers 2014-07-14 20:26:02 +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