Commit graph

  • 7a441cea77 Taking a break now, 63 modmuss50 2019-02-22 15:11:38 +0000
  • fd0fa8c66e Bunch of item work, 96 modmuss50 2019-02-22 15:02:41 +0000
  • 91994e5a01 229 - comment out all recipes as we can deal with these later + start thinking more about tags modmuss50 2019-02-22 14:27:22 +0000
  • ab2ce91e39 MOre rubber stuff. ONly sapling left to do drcrazy 2019-02-22 17:25:31 +0300
  • b6494ecbf6 Merge with HEAD drcrazy 2019-02-22 17:18:40 +0300
  • a5b2adac78 More minor fixes, 370 modmuss50 2019-02-22 14:11:55 +0000
  • d68c65641d Gui fixes, 393 modmuss50 2019-02-22 14:02:04 +0000
  • 06632be822 One more block done. Just a few left drcrazy 2019-02-22 16:14:46 +0300
  • 647b126c98 Updated mappings drcrazy 2019-02-22 14:36:13 +0300
  • b864d551dd Update mappings + more tile work modmuss50 2019-02-22 10:29:11 +0000
  • 63fe6d2ef4 Some luv to rubber stuff ) drcrazy 2019-02-22 13:21:46 +0300
  • 6f9baaeb30 Crafting manager fixes modmuss50 2019-02-22 09:47:07 +0000
  • a003656419 GUI fixes drcrazy 2019-02-22 11:51:55 +0300
  • f78b16293f Merge remote-tracking branch 'origin/1.13' into 1.13 modmuss50 2019-02-21 23:07:51 +0000
  • 18b3535607 More fixes 637 modmuss50 2019-02-21 23:07:44 +0000
  • ec919415fb Update strings to textcomponent drcrazy 2019-02-22 02:00:37 +0300
  • f51222ac3e Remove some old stuff modmuss50 2019-02-21 22:54:09 +0000
  • 61b6d30262 Bunch of tile work 752 modmuss50 2019-02-21 22:46:26 +0000
  • 1ab52f40c2 FIxed import for EventPriority drcrazy 2019-02-22 01:20:54 +0300
  • e3be87d517 MOre fixes for items. Down to 860 drcrazy 2019-02-22 01:13:30 +0300
  • e513e20e5a Migrated batteries + TR Itemgroup drcrazy 2019-02-22 00:22:43 +0300
  • 0c99a94250 Update packets to new format, 930 errors modmuss50 2019-02-21 18:29:04 +0000
  • f6a79ce579 Some random fixes, 959 errors modmuss50 2019-02-21 18:11:55 +0000
  • 0975b4353b Nuke the dev command as it will need rewriting modmuss50 2019-02-21 17:56:04 +0000
  • a93361792f fix ConfigRegistry location, 1118 errors modmuss50 2019-02-21 17:55:17 +0000
  • 02d2d9cf1c Start work on porting tool and armor materials, values still need porting over modmuss50 2019-02-21 17:53:30 +0000
  • 0b0435a1a2 MOre work on blocks. Less then 1200 errors left drcrazy 2019-02-21 18:21:40 +0300
  • 93cf0a97d5 Tier 0, 2, 3 machine blocks fixed drcrazy 2019-02-21 16:27:18 +0300
  • 3201ac878b Energy Storage migrated drcrazy 2019-02-21 16:00:12 +0300
  • 46fb0ede7a Some migration for Nuke drcrazy 2019-02-21 14:11:59 +0300
  • bd00135137 Migrated getDrops drcrazy 2019-02-21 13:54:49 +0300
  • bdb8834a3e Updated onBlockActivated drcrazy 2019-02-21 13:35:54 +0300
  • 8489259672 Recipes migrated for ChemReactor and Rolling Machine drcrazy 2019-02-21 13:08:16 +0300
  • 5c7c29f34d Updated @RebornRegister annotation usage drcrazy 2019-02-21 12:48:35 +0300
  • 860068b27a Flora based extractor recipes drcrazy 2019-02-21 12:23:07 +0300
  • 398cb9617d Removed unused import drcrazy 2019-02-21 02:43:27 +0300
  • 1567920c8e Updated addInformation method for blocks and items drcrazy 2019-02-21 01:53:33 +0300
  • 6be1fbc4e9 Updated createNewTileEntity method drcrazy 2019-02-21 00:19:11 +0300
  • df8c2cd34b 1.13.2 modmuss50 2019-02-20 20:27:03 +0000
  • 5bc08557b3 Migration work on TR armor drcrazy 2019-02-20 23:12:36 +0300
  • b9992292b2 Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2019-02-20 19:39:46 +0000
  • e03734e66d Fix #1669 modmuss50 2019-02-20 19:39:23 +0000
  • 0086d88e1d #releaseBuild modmuss50 2019-02-17 19:00:30 +0000
  • 4aae2422fa Fix LED lights not using correct cables modmuss50 2019-02-15 19:12:11 +0000
  • 65b95afed8 After complaints that the manual is a scam, you can now refund it back into its ingredients. modmuss50 2019-02-15 18:33:45 +0000
  • 8b82259871 Iron and gold armor recycling in blast furnace. drcrazy 2019-02-15 14:19:48 +0300
  • 4addff892b Create a WrenchContext to allow for ic2 mod compat to register support for using ic2's wrench modmuss50 2019-02-14 15:58:33 +0000
  • 8e34062f6e Iron alloy smelter should consume right amount of inputs. Closes #1667 drcrazy 2019-02-13 14:56:49 +0300
  • fbcab3bf2d DRY for IronAlloySmelter fuel burn time drcrazy 2019-02-13 11:20:52 +0300
  • 008358b39c #releaseBuild modmuss50 2019-02-11 23:50:48 +0000
  • 3fb799e544 Removed unused imports drcrazy 2019-02-11 15:35:37 +0300
  • 0fa72c4fc3 More efficient diamond grinding and armor recycling drcrazy 2019-02-11 15:32:24 +0300
  • 3610535169 #releaseBuild modmuss50 2019-02-07 21:26:37 +0000
  • b9169c5397 Merge remote-tracking branch 'origin/1.12' into 1.12 modmuss50 2019-02-07 20:26:52 +0000
  • c4fff1bf56 Should fix #1666 modmuss50 2019-02-07 20:26:41 +0000
  • 4797d64f5b #releaseBuild fix Advanced alloy modmuss50 2019-02-05 00:15:43 +0000
  • 16ec10dcd3 Added config for classic dedupe, #releaseBuild modmuss50 2019-02-04 21:59:22 +0000
  • 6595bb80c5 Move type registry to before the ic2 dict, add advanced alloy to classic dedupe. modmuss50 2019-02-04 21:51:21 +0000
  • 8549129870 Dont register refined iron smelting recipe with classic dedupe enabled modmuss50 2019-02-04 21:27:49 +0000
  • f836fb84c7 Move IC2_PROFILE to a config, the event is fired too early to be used. modmuss50 2019-02-04 20:53:33 +0000
  • 6916de2ad7 Added support for ic2 exp classic profile modmuss50 2019-02-04 20:19:51 +0000
  • bccfe14d7c
    #releaseBuild fixes issues with transformers Modmuss50 2019-02-02 06:35:29 +0000
  • 094f2fc050 #releaseBuild modmuss50 2019-02-01 15:32:05 +0000
  • 9301cfbc90 Improve rolling machine item balancing, it will no longer move items around when there isnt a better distribution modmuss50 2019-02-01 14:46:18 +0000
  • 72a09d2368 Fixes some possible NPE locations modmuss50 2019-02-01 13:42:21 +0000
  • a5fa237017
    Merge pull request #1660 from coderbot16/1.12-multipackets Modmuss50 2019-01-30 19:41:14 +0000
  • 3e44fc369f Transformers now declare that they can output multiple packets per tick coderbot 2019-01-28 17:38:02 -0800
  • 12b892f0dc Fix Alarm recipe with IC2 Dedupe modmuss50 2019-01-27 01:42:52 +0000
  • 039537fcdb #releaseBuild modmuss50 2019-01-26 19:24:39 +0000
  • 8505616651 Fix fusion coil not being crafted with ic2 de-dupe modmuss50 2019-01-26 19:06:51 +0000
  • 199fa63041 #releaseBuild - New IF and Baubles integration modmuss50 2019-01-24 22:51:39 +0000
  • 0228d72179 Always add refined iron ingot to smelting, I forgot to remove it modmuss50 2019-01-24 21:38:21 +0000
  • f4a24d7c25 Fixes to retro gen modmuss50 2019-01-24 21:35:39 +0000
  • 5a9349ced4 Pull back power output on Thermal gen as I made it a bit too much last commit. Now 16 modmuss50 2019-01-24 21:26:56 +0000
  • bc1e2ca7eb
    Thermal Generator now outputs 32 eu/tick Modmuss50 2019-01-20 21:14:15 +0000
  • 0bd22f1a55
    Added pack count to readme Modmuss50 2019-01-19 23:58:38 +0000
  • 7415c33ac8 #releaseBuild Fix startup crash modmuss50 2019-01-18 16:51:08 +0000
  • bc4deb44ef Update modmuss50 2019-01-18 16:45:31 +0000
  • 132aefd81e #releaseBuild modmuss50 2019-01-18 16:26:01 +0000
  • 498d675f30 Remove Refined Iron from ic2 duplicates modmuss50 2019-01-18 16:20:34 +0000
  • 292664b8e1 Fixed i18n usage on server. Closes #1655 drcrazy 2019-01-16 18:07:48 +0300
  • ecda412b46 Bumped forge to 14.23.5.2796 drcrazy 2019-01-14 16:07:06 +0300
  • 7cc0c472f9 Adjustments for updated power output icon. drcrazy 2019-01-14 15:11:26 +0300
  • 1a8c730591 Plasma generator got its icon in JEI. Closes #1653 drcrazy 2019-01-14 14:10:26 +0300
  • 8a03b0eca2 More on #1654 drcrazy 2019-01-14 14:04:58 +0300
  • 381fbfb463 Fix JEI info for sawmill energy usage. Some work for #1654 drcrazy 2019-01-14 14:04:22 +0300
  • f08fd1da4d 1591 - I think ill come back to this another day modmuss50 2019-01-13 17:04:03 +0000
  • b6312b124a 1696 - find + replace pass modmuss50 2019-01-13 16:51:50 +0000
  • 368e2d48df 2123 - Gradle setup modmuss50 2019-01-12 19:56:42 +0000
  • 4422fc7dc0 Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep modmuss50 2019-01-12 12:08:28 +0000
  • 43cf6d7807 Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep modmuss50 2019-01-07 22:59:06 +0000
  • 7df4742784 Merge remote-tracking branch 'remotes/origin/1.12' into 1.13-prep modmuss50 2019-01-07 22:58:42 +0000
  • 901e472844 #releaseBuild modmuss50 2019-01-04 21:47:37 +0000
  • 95ef8e4df5 #releaseBuild modmuss50 2019-01-03 14:05:49 +0000
  • 94fd111224 #releaseBuild modmuss50 2019-01-03 14:00:33 +0000
  • d67f670141 addHologramButton is now in RC drcrazy 2018-12-30 22:50:03 +0300
  • 3df454789f Draw hologram button on background drcrazy 2018-12-30 22:31:52 +0300
  • 03fdbe49a6 Power bar tooltip should be on top of hologram button drcrazy 2018-12-30 02:48:35 +0300
  • d41da2457f Lock button works again drcrazy 2018-12-30 01:19:23 +0300
  • b33b3d8745 Updates due to TR GUI builder gone. drcrazy 2018-12-28 18:07:35 +0300