1. 0a53a47 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  2. 9009c73 Fixes that don't fix anything. by Florian Nücke · 11 years ago
  3. 9eb112d Added Mekanism API and supporting its power system directly. by Florian Nücke · 11 years ago
  4. 9a41e9a Added 1.7 UE API. No idea if this implementation is correct, tho. by Florian Nücke · 11 years ago
  5. 2f03b93 Added 1.7 RF (TE) API. by Florian Nücke · 11 years ago
  6. b05e239 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  7. 72e47bc Mod ids as constants instead of strings all over the place. by Florian Nücke · 11 years ago
  8. 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
  9. 672d9d6 Merge branch 'master' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
  10. 14d79b9 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
  11. 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
  12. 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
  13. da8b6c5 Compiler fun! by Florian Nücke · 11 years ago
  14. e125d88 Missed one. by Florian Nücke · 11 years ago
  15. 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
  16. 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
  17. 9d49a98 Some cleanup. by Florian Nücke · 11 years ago
  18. 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
  19. 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
  20. b56f657 Merge pull request #418 from Vexatos/patch-9 by Florian Nücke · 11 years ago
  21. 86c580a Update oppm.lua by Vexatos · 11 years ago
  22. 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
  23. bad2f94 Update components.lua by istasi · 11 years ago
  24. d37ccc9 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  25. 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
  26. 3dd3eed Removed more stuff from new font renderer that's no longer needed. by Florian Nücke · 11 years ago
  27. 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
  28. 35116c2 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
  29. 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
  30. 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
  31. 15125cc More mysterious NPEs! by Florian Nücke · 11 years ago
  32. 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
  33. 421e204 Organize imports. by Florian Nücke · 11 years ago
  34. 827e30a Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  35. ca5b380 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
  36. 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
  37. 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
  38. 81bdce1 Fix potential NPE. by Florian Nücke · 11 years ago
  39. e8eb3a4 Updated for the side check change. by Florian Nücke · 11 years ago
  40. ef00347 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
  41. 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
  42. 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
  43. 78c6d01 Fix for version injection into config after file name change. by Florian Nücke · 11 years ago
  44. 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
  45. 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
  46. 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
  47. 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
  48. 20443f5 Fixes for the adjusted side checks. by Florian Nücke · 11 years ago
  49. 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
  50. 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
  51. 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
  52. 11592e6 Minor refactoring. by Florian Nücke · 11 years ago
  53. 1cfd1cf Adjusted for 1.7. by Florian Nücke · 11 years ago
  54. 653e281 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  55. 14ff4ce Added visual indicator for disks in disk drives (they 'stand out' a bit now). by Florian Nücke · 11 years ago
  56. 9590cf5 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  57. 9964575 Localized strings for switch GUI. by Florian Nücke · 11 years ago
  58. e0c22f0 Potential fix for #409. by Florian Nücke · 11 years ago
  59. 7149eea Fixed robots bouncing back network messages. by Florian Nücke · 11 years ago
  60. 8cc4232 Generified inventory name stuffs, will make this less conflict-prone with MC1.7 in the future. by Florian Nücke · 11 years ago
  61. 4f289cd Getting rid of a crapton of redundant code. BEWARE: resulted in most textures being renamed! by Florian Nücke · 11 years ago
  62. 07edd56 Pet rendering fixes. by Florian Nücke · 11 years ago
  63. f8d8b27 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  64. 021a0bc Synchronizing values for open switch GUI. by Florian Nücke · 11 years ago
  65. 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
  66. 8f572d2 Also updated localization keys from 'router' to 'switch'/'access point'. by Florian Nücke · 11 years ago
  67. 828213c Some refactoring to get rid of the use of 'router' instead of 'switch' for consistency. by Florian Nücke · 11 years ago
  68. d4618e6 Merge branch 'master' of https://github.com/Kilobyte22/OpenComputers into switch-upgrades by Florian Nücke · 11 years ago
  69. 8a5305c Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  70. 4f73a83 Fixed aliases with arguments killing of actual arguments. by Florian Nücke · 11 years ago
  71. 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
  72. 50e1fdd Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  73. 88710b7 Should fix render glitches in screen GUI for inaccurate texture samplers. by Florian Nücke · 11 years ago
  74. c4430cc Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  75. ae32a08 OCD! by Florian Nücke · 11 years ago
  76. d9d07f2 Merge branch 'patch-3' of https://github.com/istasi/OpenComputers by Florian Nücke · 11 years ago
  77. 92ff389 Merge branch 'patch-2' of https://github.com/istasi/OpenComputers by Florian Nücke · 11 years ago
  78. 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
  79. 96b947c Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
  80. 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
  81. c1d5371 Ugly workaround for IC2+Racks, closes #404. by Florian Nücke · 11 years ago
  82. bc080f3 make openos perfer screens with keyboards attached. by istasi · 11 years ago
  83. 1674dc5 Make boot loader prefer screens with keyboards attached by istasi · 11 years ago
  84. 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
  85. 05a0211 Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
  86. 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
  87. 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
  88. 9a3049e Fixed the fix for getKeyboards(), gah. by Florian Nücke · 11 years ago
  89. 713c7ae Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  90. 30eec9b Merge branch 'LuaJSucks' of https://github.com/gamax92/OpenComputers by Florian Nücke · 11 years ago
  91. 4b1fb14 Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  92. c17334f Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 by Florian Nücke · 11 years ago
  93. 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
  94. ae2d284 Added setting to allow forcing use of old font renderer. by Florian Nücke · 11 years ago
  95. 19d1edf Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers by Florian Nücke · 11 years ago
  96. f0f4a69 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
  97. fa4413f 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
  98. e7d64fa Version bump. by Florian Nücke · 11 years ago
  99. 99536f5 Fixed text centering in robot GUI's screen. by Florian Nücke · 11 years ago
  100. f3b7b41 Merge branch 'patch-8' of https://github.com/Vexatos/OpenComputers by Florian Nücke · 11 years ago