Rivoreo Source Code Repositories
src.rivoreo.one / minecraft / mekanism / 6308bf7e2f1376dd3c74e2952dd387119da4a9fd
  1. 6308bf7 Merge branch 'development' into 1.8 by Ben Spiers · 10 years ago
  2. 85e93bb Merge branch 'master' into development by Ben Spiers · 10 years ago
  3. ce390ae Reorganise trait registration by Ben Spiers · 10 years ago
  4. 0a0f67e Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 by Ben Spiers · 10 years ago
  5. 791ed60 Merge branch 'development' into 1.8 by Ben Spiers · 10 years ago
  6. 5749ed4 Merge branch 'master' into development by Ben Spiers · 10 years ago
  7. 1f2dd31 Reorganise trait registration by Ben Spiers · 10 years ago
  8. 1a8e232 Get rid of IPipeTile since it wasn't working anyway. Fixes #1971, #1975 by Ben Spiers · 10 years ago
  9. 9818f2f Merge pull request #1974 from Mazdallier/patch-1 by Aidan · 10 years ago
  10. 05fa56e Update fr_FR.lang by Yves · 10 years ago
  11. 19fa918 Merge branch 'development' into 1.8 by Ben Spiers · 10 years ago
  12. 7ab1e66 Merge branch 'master' into development by Ben Spiers · 10 years ago
  13. 11fac12 Should fix #1762. by Ben Spiers · 10 years ago
  14. c8db5b8 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
  15. a699a4b Merge branch 'master' into development by Aidan C. Brady · 10 years ago
  16. de5cc8c Merge fix changes by Aidan C. Brady · 10 years ago
  17. e54edcf Another fix attempt by Aidan C. Brady · 10 years ago
  18. 53b5a25 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
  19. ebb23fb Merge branch 'master' into development by Aidan C. Brady · 10 years ago
  20. 5be57a2 Attempt a fix at an API bug by Aidan C. Brady · 10 years ago
  21. 1b159d3 Another cleanup by Aidan C. Brady · 10 years ago
  22. 607eb31 A few minor cleanups by Aidan C. Brady · 10 years ago
  23. 5fd1217 Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
  24. d4ee103 Merge branch 'master' into development by Aidan C. Brady · 10 years ago
  25. 64dba94 Merge pull request #1958 from fewizz/patch-3 by Aidan · 10 years ago
  26. d2030a7 Merge pull request #1963 from Mazdallier/patch-2 by Aidan · 10 years ago
  27. e6838c6 Fixed up BC API by Aidan C. Brady · 10 years ago
  28. 2507bd3 Fix some merge dodginess. by Ben Spiers · 10 years ago
  29. c5e8c86 Fix me being stupid. #1943 by Ben Spiers · 10 years ago
  30. 6872279 Stop UniCables claiming to carry MJ by Ben Spiers · 10 years ago
  31. ece8c6e Only receive RF from sides in NORMAL mode. by Ben Spiers · 10 years ago
  32. 224d778 Make PULL mode actually, and exclusively, pull. by Ben Spiers · 10 years ago
  33. b31aa92 Update lots of APIs, most notably BC and an actual 1.7 version of CC by Ben Spiers · 10 years ago
  34. 21dc525 Failed merge, retrying by Aidan C. Brady · 10 years ago
  35. 30cf159 Update fr_FR.lang by Yves · 10 years ago
  36. 7f38006 Update ru_RU.lang by fewizz · 10 years ago
  37. 64d0f8a Merge branch 'master' into development by Ben Spiers · 10 years ago
  38. 3a805bd Fix me being stupid. #1943 by Ben Spiers · 10 years ago
  39. a0c4928 Merge branch 'master' into development by Ben Spiers · 10 years ago
  40. 8f6b24b Stop UniCables claiming to carry MJ by Ben Spiers · 10 years ago
  41. 0d21d20 Only receive RF from sides in NORMAL mode. by Ben Spiers · 10 years ago
  42. 92f1579 Make PULL mode actually, and exclusively, pull. by Ben Spiers · 10 years ago
  43. 5b4f154 Giant optimise imports. by Ben Spiers · 10 years ago
  44. 4d1c128 Update lots of APIs, most notably BC and an actual 1.7 version of CC by Ben Spiers · 10 years ago
  45. 3abf36e Fixes to config GUI, added new localization by Aidan C. Brady · 10 years ago
  46. 3cfc21c Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
  47. 51cccfa Merge branch 'master' into development by Aidan C. Brady · 10 years ago
  48. e2e3e10 Merge pull request #1932 from Mazdallier/patch-1 by Aidan · 10 years ago
  49. 775eedb Update fr_FR.lang by Yves · 10 years ago
  50. 0cccaaa Merge branch 'development' into 1.8 by Aidan Brady · 10 years ago
  51. 920a70d Merge branch 'master' into development by Aidan Brady · 10 years ago
  52. 284a626 Merge pull request #1920 from LorenzoDCC/master by Aidan · 10 years ago
  53. aa103e2 Minor cleanup by Aidan Brady · 10 years ago
  54. c1f5b65 Merge branch 'master' into development by Aidan Brady · 10 years ago
  55. 9460aa8 Merge pull request #1887 from SKCraft/master by Aidan · 10 years ago
  56. 1ef406e Merge branch 'master' into development by Aidan Brady · 10 years ago
  57. 1b665d9 Fixed a Portable Tank crash by Aidan Brady · 10 years ago
  58. 6130c1a Merge pull request #1923 from cedced19/patch-1 by Aidan · 10 years ago
  59. 9a96ad2 Update FR language by Cédric · 10 years ago
  60. aef8464 Let there be translated descriptions! by LorenzoDCC · 10 years ago
  61. 1010767 Fixed strange glow panel issue by Aidan C. Brady · 10 years ago
  62. 60bf7f5 Merge branch 'development' into 1.8 (gosh darn conflicts) by Aidan C. Brady · 10 years ago
  63. d0a62c5 Merge branch 'master' into development by Aidan C. Brady · 10 years ago
  64. 8315c1f gigi gege by LorenzoDCC · 10 years ago
  65. fc83b1b Added NEI usage handler for infusion objects by Tonius · 10 years ago
  66. 92a5929 That was not a statement. by Ben Spiers · 10 years ago
  67. 4f41f5a Prevent IC2 double-outputting. by Ben Spiers · 10 years ago
  68. f0b7f34 ElectricBlocks now output to IC2 properly. by Ben Spiers · 10 years ago
  69. 3e71622 Update IC2 api by Ben Spiers · 10 years ago
  70. 3c715d9 Shuffle up EnergyNet support a bit. by Ben Spiers · 10 years ago
  71. b25d8f6 Only use the EnergyNet-related interfaces if IC2 itself is loaded. by Ben Spiers · 10 years ago
  72. ed8823b Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
  73. 65ea389 Merge branch 'master' into development by Aidan C. Brady · 10 years ago
  74. 26dadfe Merge pull request #1876 from sk89q/oredictcache-fix by Aidan · 10 years ago
  75. 5adc2a8 Merge pull request #1883 from TheJulianJES/patch-1 by Aidan · 10 years ago
  76. ea42e52 Fix > 3D Bow Bug by TheJulianJES · 10 years ago
  77. 16fc882 Change OreDictCache to hit the hash map one fewer time. by sk89q · 10 years ago
  78. 125ac34 Use object default hashCode in ItemInfo for Item. by sk89q · 10 years ago
  79. 3f6c87d Fix ItemInfo.equals() not functioning as intended. by sk89q · 10 years ago
  80. 5d08726 Add config options to blacklist the different power systems. by Ben Spiers · 10 years ago
  81. 417b072 Hopefully stop corruption hitting gas tanks. by Ben Spiers · 10 years ago
  82. e7f3204 Fix a tesseract fluid issue. by Ben Spiers · 10 years ago
  83. c01212a Merge branch 'development' into 1.8 by Aidan C. Brady · 10 years ago
  84. 94108d3 Made MekGen recipes more OreDict friendly by Aidan C. Brady · 10 years ago
  85. 9eb9eab Added in a fun little silk touch multiplier config by Aidan C. Brady · 10 years ago
  86. 521f7d7 Cleanup by Aidan C. Brady · 10 years ago
  87. 9bf4baa Merge branch 'development' into 1.8 (hopefully I didn't miss anything) by Aidan C. Brady · 10 years ago
  88. cde5755 Fixed an import by Aidan C. Brady · 10 years ago
  89. f72f462 Merge pull request #1860 from jmongeon/Comparator by Aidan · 10 years ago
  90. 10ce89d Merge pull request #1863 from puyo061/patch-2 by Aidan · 10 years ago
  91. 6ff7ece Update ko_KR.lang by [MMKP]Puyo061 · 10 years ago
  92. 5011ea1 Add comparator support to the GasTank (#1829). by jmongeon · 10 years ago
  93. f240f90 Merge pull request #1858 from puyo061/patch-1 by Aidan · 10 years ago
  94. 6899061 Create ko_KR.lang by [MMKP]Puyo061 · 10 years ago
  95. d31ebf8 Hopefully fix the Gas Generator issue for good. by Ben Spiers · 10 years ago
  96. 63101ad Merge pull request #1854 from pwestling/add_salination_speed_config by Ben Spiers · 10 years ago
  97. 68f6348 Merge pull request #1853 from pwestling/add_dump_excess_to_gas_tank by Ben Spiers · 10 years ago
  98. 0c5fa1b Merge pull request #1852 from pwestling/add_decrement_teleporter_digit by Ben Spiers · 10 years ago
  99. 212ae4d Merge pull request #1850 from pwestling/fix_transporter_respect_nbt_in_dest_inventory by Ben Spiers · 10 years ago
  100. ee03cea Merge pull request #1849 from pwestling/fix_transporter_nbt_serialization by Ben Spiers · 10 years ago