- 679159d Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 7895785 Adjusted robot GUI for new font renderer's char aspect ratio (auto-sizes now). by Florian Nücke · 11 years ago
- 304b1fb Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 114b232 Fixed texture names. by Florian Nücke · 11 years ago
- fe49814 Added Mekanism to power converter tooltip and power mod availability check. by Florian Nücke · 11 years ago
- 0a53a47 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 9009c73 Fixes that don't fix anything. by Florian Nücke · 11 years ago
- 9eb112d Added Mekanism API and supporting its power system directly. by Florian Nücke · 11 years ago
- 9a41e9a Added 1.7 UE API. No idea if this implementation is correct, tho. by Florian Nücke · 11 years ago
- 2f03b93 Added 1.7 RF (TE) API. by Florian Nücke · 11 years ago
- b05e239 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 72e47bc Mod ids as constants instead of strings all over the place. by Florian Nücke · 11 years ago
- 89ab372 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 672d9d6 Merge branch 'master' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
- 14d79b9 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
- 6b0fa7d Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 by Florian Nücke · 11 years ago
- 997cd0a Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 by Florian Nücke · 11 years ago
- da8b6c5 Compiler fun! by Florian Nücke · 11 years ago
- e125d88 Missed one. by Florian Nücke · 11 years ago
- 604ec89 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 by Florian Nücke · 11 years ago
- dc27847 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 by Florian Nücke · 11 years ago
- 9d49a98 Some cleanup. by Florian Nücke · 11 years ago
- 5f19433 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. by Florian Nücke · 11 years ago
- fe4444d Revert "Trying to get rid of `FMLCommonHandler.instance.getEffectiveSide` where possible, since it can apparently fail in some scenarios." by Florian Nücke · 11 years ago
- b56f657 Merge pull request #418 from Vexatos/patch-9 by Florian Nücke · 11 years ago
- 86c580a Update oppm.lua by Vexatos · 11 years ago
- 23be2a7 Cleaned up components.lua a little and allowing to specify multiple filters (each argument is used as filter) and only printing methods for -l. by Florian Nücke · 11 years ago
- bad2f94 Update components.lua by istasi · 11 years ago
- d37ccc9 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 1004c95 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. by Florian Nücke · 11 years ago
- 3dd3eed Removed more stuff from new font renderer that's no longer needed. by Florian Nücke · 11 years ago
- eadc882 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 35116c2 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
- d1e3fcd Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 by Florian Nücke · 11 years ago
- db2b443 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 by Florian Nücke · 11 years ago
- 15125cc More mysterious NPEs! by Florian Nücke · 11 years ago
- 728f8ed Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 421e204 Organize imports. by Florian Nücke · 11 years ago
- 827e30a Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- ca5b380 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
- 1879706 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 by Florian Nücke · 11 years ago
- 3161422 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 by Florian Nücke · 11 years ago
- 81bdce1 Fix potential NPE. by Florian Nücke · 11 years ago
- e8eb3a4 Updated for the side check change. by Florian Nücke · 11 years ago
- ef00347 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
- 70dbb33 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 by Florian Nücke · 11 years ago
- 02f8acc Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 by Florian Nücke · 11 years ago
- 78c6d01 Fix for version injection into config after file name change. by Florian Nücke · 11 years ago
- e054012 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.6.4 by Florian Nücke · 11 years ago
- 5c7be3e Merge branch 'OC1.3-MC1.7.2' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.7.2 into OC1.3-MC1.7.10 by Florian Nücke · 11 years ago
- 09332db Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-1.3-MC1.6.4 into OC1.3-MC1.7.2 by Florian Nücke · 11 years ago
- 738bcb5 Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.6.4 by Florian Nücke · 11 years ago
- 20443f5 Fixes for the adjusted side checks. by Florian Nücke · 11 years ago
- 83a79ad Merge branch 'OC1.3-MC1.6.4' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.6.4 into OC1.3-MC1.7.2 by Florian Nücke · 11 years ago
- 93218f4 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. by Florian Nücke · 11 years ago
- b3813bc Trying to get rid of `FMLCommonHandler.instance.getEffectiveSide` where possible, since it can apparently fail in some scenarios. by Florian Nücke · 11 years ago
- 11592e6 Minor refactoring. by Florian Nücke · 11 years ago
- 1cfd1cf Adjusted for 1.7. by Florian Nücke · 11 years ago
- 653e281 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 14ff4ce Added visual indicator for disks in disk drives (they 'stand out' a bit now). by Florian Nücke · 11 years ago
- 9590cf5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 9964575 Localized strings for switch GUI. by Florian Nücke · 11 years ago
- e0c22f0 Potential fix for #409. by Florian Nücke · 11 years ago
- 7149eea Fixed robots bouncing back network messages. by Florian Nücke · 11 years ago
- 8cc4232 Generified inventory name stuffs, will make this less conflict-prone with MC1.7 in the future. by Florian Nücke · 11 years ago
- 4f289cd Getting rid of a crapton of redundant code. BEWARE: resulted in most textures being renamed! by Florian Nücke · 11 years ago
- 07edd56 Pet rendering fixes. by Florian Nücke · 11 years ago
- f8d8b27 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 021a0bc Synchronizing values for open switch GUI. by Florian Nücke · 11 years ago
- 33a8f56 Added third upgrade type for switches (for packets / send cycle), using RAM for that, hard drives for queue size. by Florian Nücke · 11 years ago
- 8f572d2 Also updated localization keys from 'router' to 'switch'/'access point'. by Florian Nücke · 11 years ago
- 828213c Some refactoring to get rid of the use of 'router' instead of 'switch' for consistency. by Florian Nücke · 11 years ago
- d4618e6 Merge branch 'master' of https://github.com/Kilobyte22/OpenComputers into switch-upgrades by Florian Nücke · 11 years ago
- 8a5305c Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 4f73a83 Fixed aliases with arguments killing of actual arguments. by Florian Nücke · 11 years ago
- 1532b8a Adjusted IDs to not include additional 'oc' namespace to get rid of the startup warnings. Closes #402. by Florian Nücke · 11 years ago
- 50e1fdd Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 88710b7 Should fix render glitches in screen GUI for inaccurate texture samplers. by Florian Nücke · 11 years ago
- c4430cc Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- ae32a08 OCD! by Florian Nücke · 11 years ago
- d9d07f2 Merge branch 'patch-3' of https://github.com/istasi/OpenComputers by Florian Nücke · 11 years ago
- 92ff389 Merge branch 'patch-2' of https://github.com/istasi/OpenComputers by Florian Nücke · 11 years ago
- 60fb366 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 96b947c Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
- 6ff77e4 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 by Florian Nücke · 11 years ago
- c1d5371 Ugly workaround for IC2+Racks, closes #404. by Florian Nücke · 11 years ago
- bc080f3 make openos perfer screens with keyboards attached. by istasi · 11 years ago
- 1674dc5 Make boot loader prefer screens with keyboards attached by istasi · 11 years ago
- 78af457 Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 05a0211 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
- 25724a0 Merge branch 'OC1.3-MC1.7.2' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10 by Florian Nücke · 11 years ago
- d3028a3 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.2 by Florian Nücke · 11 years ago
- 9a3049e Fixed the fix for getKeyboards(), gah. by Florian Nücke · 11 years ago
- 713c7ae Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 30eec9b Merge branch 'LuaJSucks' of https://github.com/gamax92/OpenComputers by Florian Nücke · 11 years ago
- 4b1fb14 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- c17334f Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
- 2cde13b 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. by Florian Nücke · 11 years ago
- ae2d284 Added setting to allow forcing use of old font renderer. by Florian Nücke · 11 years ago
- 19d1edf Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago