Commit graph

  • 5dc9809bde Update .gitignore TheDoctorSoda 2016-02-20 19:40:46 -0800
  • b98b8fd320 Added Compressor, E. Furnace, and Generator textures. (And modified electric alloy furnace) TheDoctorSoda 2016-02-21 01:10:06 -0800
  • ba5019867e Drill tweaks gigabit101 2016-02-20 23:19:06 +0000
  • b613b1e419 Drills gigabit101 2016-02-20 23:04:32 +0000
  • c5393d3f2b Added sound effect for sap modmuss50 2016-02-20 22:56:58 +0000
  • 0522e9539f Added some textures Added Tree Tap Added Tree Tap logic gigabit101 2016-02-20 22:50:24 +0000
  • 0cf477dd89 Some small changes and fixes. modmuss50 2016-02-20 21:01:14 +0000
  • 0cbd1c1e55 Merge pull request #342 from TheDoctorSoda/1.8.9 Modmuss50 2016-02-20 20:54:35 +0000
  • 9126338d60 Rubber TheDoctorSoda 2016-02-20 12:52:06 -0800
  • 2d98dab800 Add sap TheDoctorSoda 2016-02-20 12:38:24 -0800
  • dd7b3ef157 Merge pull request #2 from TechReborn/1.8.9 TheDoctorSoda 2016-02-20 12:18:22 -0800
  • c3f85c7347 Fixes #323 modmuss50 2016-02-20 20:07:05 +0000
  • af7f4a571b Fixes leaves rendering weird modmuss50 2016-02-20 19:59:09 +0000
  • 1f59226e01 Add some stuff, that does things modmuss50 2016-02-20 19:46:18 +0000
  • fe216fba03 Merge pull request #1 from TechReborn/1.8.9 TheDoctorSoda 2016-02-20 10:42:44 -0800
  • 0ac86ff303 Added sapling modmuss50 2016-02-20 18:40:35 +0000
  • d3c3f3edcf Might've fixed tiling issue w/ rubber TheDoctorSoda 2016-02-20 10:39:32 -0800
  • 7edbabd419 Merge pull request #341 from TheDoctorSoda/1.8.9 Modmuss50 2016-02-20 18:31:17 +0000
  • 44a60d984a Rubber sapling TheDoctorSoda 2016-02-20 10:29:03 -0800
  • 6278a72d59 Merge pull request #340 from TheDoctorSoda/1.8.9 Modmuss50 2016-02-20 18:08:09 +0000
  • 765475bee7 Changed rubber textures TheDoctorSoda 2016-02-20 09:58:03 -0800
  • 457178842c Revert "Move IC2 api" modmuss50 2016-02-20 17:06:46 +0000
  • ac43b5afc4 Move IC2 api modmuss50 2016-02-20 17:02:28 +0000
  • 71c2bfee7f Moved power system to RC and spawn trees in groups modmuss50 2016-02-20 16:59:31 +0000
  • 891d2cce32 Added rubber processing modmuss50 2016-02-20 10:58:58 +0000
  • defde302fe Added machine block recipe last commit for night gigabit101 2016-02-20 03:57:15 +0000
  • ee2841b5b1 Added machine blocks gigabit101 2016-02-20 03:47:35 +0000
  • f947ef37a4 Added basic battery and fixed issues with Lithium Battery gigabit101 2016-02-20 03:35:20 +0000
  • 047625389d Added compressor, extractor, electric furnace gigabit101 2016-02-20 03:07:56 +0000
  • cd13932bde Basic generator just needs logic gigabit101 2016-02-20 02:21:44 +0000
  • cfab240ac7 Added some more items modmuss50 2016-02-20 01:32:08 +0000
  • 4521008c73 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 gigabit101 2016-02-20 01:08:22 +0000
  • 464d8cac03 Added advancedCircuit and Circuit gigabit101 2016-02-20 01:08:18 +0000
  • 575150edf3 Fix jei log spam modmuss50 2016-02-20 01:03:37 +0000
  • eaf82b68e8 Fix tree rarity modmuss50 2016-02-20 00:58:04 +0000
  • aa41d576e3 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 gigabit101 2016-02-20 00:58:02 +0000
  • 8ad4a45716 Added basic Grinder gigabit101 2016-02-20 00:57:57 +0000
  • a76384504f Rubber Trees modmuss50 2016-02-20 00:55:18 +0000
  • f8ca41a9ce Closes #294 gigabit101 2016-02-19 23:33:18 +0000
  • 6636fc648b Initial work on rubber trees modmuss50 2016-02-19 20:58:23 +0000
  • c9fad62ed2 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 modmuss50 2016-02-19 20:32:35 +0000
  • 9268fa4d55 1117 lines of new recipes? Added a new recipe manager to allow us to list the missing items that need to be reimplemented. modmuss50 2016-02-19 20:32:26 +0000
  • a1ef232b38 Update JEI, minor clean up of JEI integration mezz 2016-02-17 23:44:15 -0800
  • fb1d6f1074 Version 0.7.11 modmuss50 2016-02-16 22:05:43 +0000
  • 9a585bcfb2 Merge branch '1.7.10' into 1.8.9 modmuss50 2016-02-16 13:49:25 +0000
  • 25777b3f96 Fixes #217 modmuss50 2016-02-16 10:00:03 +0000
  • c0ebf03f72 fixes #326 modmuss50 2016-02-16 09:20:26 +0000
  • 840f524350 Quick fix for #329 modmuss50 2016-02-16 09:11:13 +0000
  • efccf62690 Update BlockOre.java Conflicts: src/main/java/techreborn/blocks/BlockOre.java The-Fireplace 2016-02-06 14:18:47 -0600
  • bf691fd8a6 Fixes #313 modmuss50 2016-02-06 11:51:55 +0000
  • ca693fbc8e Version 0.7.10 Modmuss50 2016-02-13 09:10:56 +0000
  • 484fec1680 Update build.gradle Modmuss50 2016-02-13 09:06:18 +0000
  • 99d69f3cbb Update to new RF API, closes #335 modmuss50 2016-02-10 13:15:02 +0000
  • 80327d3689 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 modmuss50 2016-02-09 17:44:02 +0000
  • 284e5d1d51 Add mc version to jar name modmuss50 2016-02-09 17:43:46 +0000
  • 910353d58d Merge pull request #334 from The-Fireplace/1.8.9 Modmuss50 2016-02-06 20:20:46 +0000
  • 0d35ecb70f Update BlockOre.java The-Fireplace 2016-02-06 14:18:47 -0600
  • b3bec47b11 Fixes #313 modmuss50 2016-02-06 11:51:55 +0000
  • 99756b355f Fixes #328 modmuss50 2016-02-06 11:48:37 +0000
  • 4585684fe2 Removed bucket textures as it now generates them at runtime modmuss50 2016-02-02 21:22:51 +0000
  • 8ec95f9119 Now using new Forge Dynamic buckets, and prep for new update modmuss50 2016-02-02 21:05:42 +0000
  • e509d42e36 Fix building on machines with < 5GB of RAM modmuss50 2016-02-02 08:31:19 +0000
  • e4af69e861 Update JEI & Forge, add recipe click areas and rolling machine transfer mezz 2016-02-01 17:58:48 -0800
  • 39f74149af Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 modmuss50 2016-02-01 15:06:29 +0000
  • c2562ac7b3 Update JSONDestroyer modmuss50 2016-02-01 15:06:14 +0000
  • e04a4a540f Prep for update for new reborn core Modmuss50 2016-01-24 11:37:43 +0000
  • e154c15fd9 Prep for update for new reborn core Modmuss50 2016-01-24 11:37:19 +0000
  • 3909a868aa Revert "Revert "Fix bucket issues"" modmuss50 2016-01-22 17:41:47 +0000
  • f7ccd07b1a Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 modmuss50 2016-01-22 13:40:47 +0000
  • 7e7ad74203 Squashed commit of the following: modmuss50 2016-01-22 13:39:20 +0000
  • d5b880387a Revert "Fix bucket issues" modmuss50 2016-01-16 17:50:18 +0000
  • 43768b9310 Fix bucket issues modmuss50 2016-01-16 15:54:41 +0000
  • 5304e38502 Update README.md Modmuss50 2016-01-16 13:27:11 +0000
  • 006b611fa3 Fix another merge error modmuss50 2016-01-16 13:16:55 +0000
  • 415531587b Fix incorrect merge modmuss50 2016-01-16 13:11:08 +0000
  • 2a617919d9 Merge remote-tracking branch 'remotes/origin/1.7.10' into 1.8.9 modmuss50 2016-01-16 13:09:09 +0000
  • b7023f3114 Merge remote-tracking branch 'remotes/origin/master' into 1.7.10 modmuss50 2016-01-16 13:06:43 +0000
  • 77bfbc46f8 closes #311 gigabit101 2016-01-16 04:32:58 +0000
  • 1ed3d226f2 Closes #320 gigabit101 2016-01-16 04:27:17 +0000
  • 692c89a6a0 Fixes #327 modmuss50 2016-01-13 17:17:53 +0000
  • eca3534d1e fixes #324 modmuss50 2016-01-13 15:41:30 +0000
  • 7139a62102 Update to fixed Reborn core and bump version modmuss50 2016-01-13 13:40:02 +0000
  • a9a85bcd84 Now use none dev version of RebornCore modmuss50 2016-01-13 11:13:38 +0000
  • fbe51d98cd update forge modmuss50 2016-01-13 11:07:47 +0000
  • c000c47f7c update: Please see http://techreborn.ninja/?p=20 Modmuss50 2016-01-12 19:15:22 +0000
  • 227217285a Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 modmuss50 2016-01-09 11:41:29 +0000
  • 2b54516bdd Fixes #321 - And I tested it so I know it works modmuss50 2016-01-09 11:41:16 +0000
  • 6c3e0e47c3 Update build.gradle Modmuss50 2016-01-07 11:03:49 +0000
  • be2f5f9e52 Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 modmuss50 2016-01-07 10:46:33 +0000
  • b588e8c08a IC2 Classic API support (This is all you are getting) modmuss50 2016-01-07 10:46:13 +0000
  • a00543c67d Update to latest JEI mezz 2016-01-06 00:46:15 -0800
  • e03bbacfcf Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 modmuss50 2016-01-05 18:12:24 +0000
  • ee86b97429 Fixed issue with RF not working as expected modmuss50 2016-01-05 18:12:13 +0000
  • 11ab05da00 Remove FastBuild modmuss50 2016-01-04 23:07:54 +0000
  • 7ecdd27752 Start work on porting from the MT script modmuss50 2016-01-03 19:07:31 +0000
  • 93f039c71b Merge branch 'master' of https://github.com/TechReborn/TechReborn modmuss50 2016-01-02 01:40:21 +0000
  • b242ec5c5f Cut all the things! modmuss50 2016-01-02 01:40:11 +0000
  • 01dfab2031 Update build.gradle Modmuss50 2016-01-01 21:33:13 +0000
  • d1b4fe3027 update JEI version mezz 2016-01-01 13:18:25 -0800
  • 7e12e3acbf Merge branch '1.8.9' of https://github.com/TechReborn/TechReborn into 1.8.9 modmuss50 2016-01-01 20:36:12 +0000