3091 commits

Author	SHA1	Message	Date
drcrazy	e4736447bd	RecipeCrafter for scrapboxinator	2018-01-19 18:08:27 +03:00
drcrazy	44b6f20357	Updated scrapboxinator to crafter and new GUI.	2018-01-19 18:07:52 +03:00
modmuss50	e0eb725878	Fix crash when codechicken lib isn't installed. #releaseBuild	2018-01-19 11:19:53 +00:00
drcrazy	c69b9f46b6	Added ability to remove fluidgenerator recipe via CT. Closes #1404	2018-01-19 11:17:36 +03:00
temp1011	91a56077d8	Work on Advanced Drill (#1411) ... * Raytracing for drill * Stop crashes if raytrace is somehow null * getCount() already checks for emptiness I think	2018-01-19 10:07:40 +03:00
drcrazy	8e12543902	Fixed RemoveAll in CraftTweaker. Closes #1410	2018-01-17 15:39:41 +03:00
drcrazy	ca9508c381	Deprecated ScrapboxList.	2018-01-17 13:57:40 +03:00
drcrazy	4fc45221a2	Removed scrapboxlist usage. Closes #1407	2018-01-17 13:53:25 +03:00
modmuss50	1bfb5d5604	Fix crash with Fusion Control computer, fixes part of #1395	2018-01-12 19:51:06 +00:00
modmuss50	819e3a5ee1	Add a null check for RayTraceResult may fix #1393	2018-01-12 19:48:41 +00:00
drcrazy	52e1fb2dc9	Fixed compressor recipe for lapis. Second point from #1396	2018-01-12 18:48:09 +03:00
drcrazy	af755a9f6e	Changed carbon fiver recipe to shaped. Closes #1394	2018-01-12 01:13:44 +03:00
drcrazy	27b1535242	Added oreDict for blockBronze. Closes #1401	2018-01-11 14:53:40 +03:00
drcrazy	9fafbf1ed4	Changed TR solar panel to use paneGlass. Closes #1400	2018-01-11 13:55:54 +03:00
drcrazy	161553503b	Fix oredict for smallDusts. Closes #1392	2018-01-11 13:31:15 +03:00
InterPlay	9de4eb947b	Updated to the newer version coming soon (pt-BR) (#1408) ... * Updated pt-BR translation. Kudos to InterPlay02	2018-01-11 13:13:22 +03:00
drcrazy	4332e8852f	TR part for #1402 done. RC to go.	2018-01-10 15:57:58 +03:00
drcrazy	85cd77e5c1	Some work on #1402. Teh moar to come.	2018-01-09 17:48:14 +03:00
modmuss50	268a16958b	Format + license headers.	2018-01-08 18:29:12 +00:00
modmuss50	2a0a9e5636	Merge remote-tracking branch 'remotes/origin/1.12' into feature-alarm	2018-01-08 17:45:29 +00:00
Dimmerworld	86d37514a7	Recipe for alarm and misc fixes	2018-01-03 15:17:20 +11:00
Dimmerworld	2177b72e41	Animation	2018-01-03 14:26:23 +11:00
Modmuss50	8d6c595215	Merge pull request #1391 from DYColdWind/patch-1 ... Update zh_cn.lang	2017-12-30 01:58:05 +00:00
冷风	78bc17a721	Update zh_cn.lang	2017-12-30 07:29:27 +08:00
modmuss50	5c16978e4d	Improve it a bit more	2017-12-29 18:15:27 +00:00
modmuss50	1d6c6139ec	Move JEI item pane out of the way if the slot config goes of the side of the screen.	2017-12-29 18:12:04 +00:00
modmuss50	ff2ed99d14	Reimplement JEI show recipes button, so it can be disabled when the slot config is shown. ... I didnt see a better way to do this, please let me know if you know better.	2017-12-29 17:24:01 +00:00
modmuss50	3e8cf290bf	Fixes crash with auto crafting table.	2017-12-29 17:09:19 +00:00
modmuss50	0b6808013d	Fixes crash with recipe book.	2017-12-29 12:50:10 +00:00
modmuss50	57f3e43ec5	Add removeAll() to all machines in crafttweaker, closes #1389	2017-12-29 12:33:05 +00:00
Dimmerworld	bdc34d673c	Proper faces	2017-12-29 16:50:35 +11:00
冷风	5f4a1be06b	Update zh_cn.lang	2017-12-29 13:26:01 +08:00
modmuss50	602cfebc38	#betaBuild	2017-12-28 15:02:59 +00:00
modmuss50	5b26f36082	Small tweak to config gui	2017-12-28 14:57:52 +00:00
modmuss50	9ff30a4344	Add support for charging FE based items	2017-12-28 14:53:56 +00:00
modmuss50	af54caf4bf	Merge remote-tracking branch 'origin/1.12' into 1.12	2017-12-28 14:40:44 +00:00
modmuss50	3b69a1a143	Added the ability to filter inputs on a slot so it only accepts valid items	2017-12-28 14:40:19 +00:00
Modmuss50	ff1dc294df	Merge pull request #1388 from InterPlay02/1.12 ... (pt-BR) Updated to match the new en_us.lang file	2017-12-28 14:31:45 +00:00
InterPlay	75f01ee507	Updated to match the new en_us.lang file (pt-BR)	2017-12-28 12:29:32 -02:00
modmuss50	751746df6f	Allow lang files to specify the location of the fluid name, closes #1386	2017-12-28 14:19:26 +00:00
modmuss50	fbd31e1177	More gui fixes for slots	2017-12-28 14:01:33 +00:00
modmuss50	04b4fa2b88	Fix tank rendering over slot config popup	2017-12-28 13:46:33 +00:00
drcrazy	7dfc8e41c3	Very-very light change in cross colors.	2017-12-28 14:43:50 +03:00
drcrazy	f18adc9c0a	Fixed texture issue in JEI.	2017-12-28 02:05:13 +03:00
InterPlay	61429dc15e	Fixed a wrong placement of signals (#1385)	2017-12-27 22:30:43 +00:00
InterPlay	77b8b75302	Fixed a wrong placement of signals	2017-12-27 20:11:59 -02:00
Dimmerworld	e93451b595	Woop woop - Alarm work (#1380) ... * Alarm makeover Model, boundrybox, textures, name localization for the alarm * Actual translations for Alarm * Texture resize As requested (Didn't notice dimensions when I was grabbing off Prospector)	2017-12-26 01:30:36 +00:00
modmuss50	510697c021	Fix #1378	2017-12-25 00:25:11 +00:00
Modmuss50	cbcb465c97	Added support for individual slot configuration ... * start work on slot config * More slot work * More gui work for slot config * Remove old sided code * More slot work * More slot memes * Stuff seems to be working :) * Start work on auto input / output * Slot IO check boxes now work * Fix buttons at different screen resolutions * Improve close button * Gui polish * Fix multiblock hologram rendering * More fixes + changes * Cleanup + output fix	2017-12-25 00:18:43 +00:00
Modmuss50	a59647a0b7	Merge pull request #1379 from InterPlay02/1.12 ... Fixed one single word	2017-12-23 22:13:45 +00:00
drcrazy	05884b2fda	Fix issue with chainsaw cutting speed. Closes #1376	2017-12-23 00:28:53 +03:00
InterPlay	91ee4e722d	Fixed one single word	2017-12-22 12:32:24 -02:00
modmuss50	5a40749bcd	Fixed #1364	2017-12-22 12:51:16 +00:00
modmuss50	623983f20a	Merge remote-tracking branch 'origin/1.12' into 1.12	2017-12-19 23:50:52 +00:00
modmuss50	7ab59db7c0	Improve idle auto crafting table tick time, more work still needs to be done. Closes #1374	2017-12-19 23:50:38 +00:00
drcrazy	1b9844a6cd	Made obsidian grindable.	2017-12-19 13:05:57 +03:00
冷风	ec1be6b639	Update zh_cn.lang	2017-12-19 13:48:50 +08:00
modmuss50	7594b55fb5	Start work on the alarm	2017-12-18 19:58:52 +00:00
InterPlay	2815bc84d4	Just fixed a single word	2017-12-18 16:09:39 -02:00
InterPlay	1909d426e3	Uploaded pt-BR.lang File	2017-12-18 16:08:00 -02:00
drcrazy	328aac0ed2	Make lapis ore grindable to vanilla lapis.	2017-12-18 18:29:00 +03:00
modmuss50	677bb59ceb	Should hopefully fix server crash #releaseBuild Fixes #1371	2017-12-18 01:48:25 +00:00
modmuss50	55c5f58c7e	Clocking device now makes the player fully invisible	2017-12-17 22:13:29 +00:00
modmuss50	3c7cd638c1	Make smaller cables have a smaller bounding box	2017-12-17 22:05:14 +00:00
modmuss50	dc4cdbb9cc	Fixes #1368	2017-12-17 21:53:14 +00:00
modmuss50	ee075feea9	Fixes #1359	2017-12-17 21:43:12 +00:00
modmuss50	7f289e2356	Add ic2 item discharge support, closes #1357	2017-12-17 21:36:48 +00:00
modmuss50	82eb0f62d6	Fixes #1354	2017-12-17 21:24:25 +00:00
drcrazy	dce7e43c4f	Fixed amount for empty cells. Closes #1366	2017-12-16 01:46:34 +03:00
drcrazy	6c7f9078ec	Secondary gem moved to eventHandler. Closes #1365	2017-12-15 16:43:48 +03:00
drcrazy	376f02df26	Updated Sawmill GUI and TileEntity.	2017-12-13 12:29:39 +03:00
drcrazy	1d18740215	Fixed rotation for solar panels. Closes #1358	2017-12-11 12:03:20 +03:00
drcrazy	17f819e9c6	Added charcoal dust grinder recipe.	2017-12-08 20:25:25 +03:00
drcrazy	a419189926	Added dust->ingot<->block recipes for several materials. Closes #1356	2017-12-08 16:43:04 +03:00
modmuss50	53c731d678	Handful of improvements to the electrical furnace, closes #1349	2017-12-04 20:55:57 +00:00
drcrazy	777707373a	Fixed cells piping into Industrial Grinder.	2017-12-04 23:10:33 +03:00
drcrazy	2f54305f6d	Added filter for fluidSlot. Closes #1352	2017-12-04 22:34:34 +03:00
冷风	e8d6009e83	Update zh_cn.lang	2017-12-02 08:26:48 +08:00
drcrazy	df24adb936	Made solar panel wrenchable	2017-12-01 19:24:02 +03:00
drcrazy	6202b46cf7	Fixed unused imports	2017-12-01 19:04:30 +03:00
Dimmerworld	3c68417fd9	Item liquidation (#1347) ... We salute our brace comrades: Solar panel Compact solar panel and Quantum singularity Whom wern't quite ready to be implemented.	2017-12-01 17:16:39 +03:00
drcrazy	b2d2be24c6	Updated recipies and fixed build	2017-11-30 16:46:11 +03:00
drcrazy	f6fca1c623	Merge branch '1.12' of https://github.com/TechReborn/TechReborn.git into feature/solar-panles	2017-11-29 17:13:36 +03:00
drcrazy	9ac8b31599	Fixed TOP\Waila icon for active machine	2017-11-29 15:23:40 +03:00
modmuss50	4d043faa27	Fixes #1344	2017-11-29 09:35:00 +00:00
modmuss50	2603fa5df7	Merge remote-tracking branch 'origin/1.12' into 1.12	2017-11-28 17:44:18 +00:00
modmuss50	b8964b6eca	Update mappings	2017-11-28 17:25:36 +00:00
drcrazy	eab088c094	Merge branch '1.12' into feature/solar-panles ... Conflicts: build.gradle src/main/java/techreborn/blocks/generator/BlockSolarPanel.java src/main/java/techreborn/blocks/lighting/BlockLamp.java	2017-11-28 17:28:47 +03:00
drcrazy	703f49752e	Updated top texture for solar panels	2017-11-28 16:52:14 +03:00
drcrazy	be227b4edb	Fixed type in zenclass name. Closes #1332	2017-11-28 15:37:38 +03:00
modmuss50	3afe2c8910	Add lang names for new lights	2017-11-28 15:37:34 +03:00
Alistair Buxton	642e6b0f2b	Implement powered lighting.	2017-11-28 15:37:32 +03:00
drcrazy	34913c4817	Added config for several multiblock machines.	2017-11-28 15:23:32 +03:00
drcrazy	9a8a7455ff	Fixed warning for FusionReactorRecipeWrapper	2017-11-27 17:58:37 +03:00
drcrazy	779551cf70	Fixed JavaDoc and CTScrapbox warnings	2017-11-27 17:55:29 +03:00
modmuss50	e2f177b757	Can now charge ic2 items, closes #1202	2017-11-27 13:34:45 +00:00
drcrazy	bff9179734	Updated multiblock to use BlockPos rather than CoordTriplet	2017-11-25 03:30:58 +03:00
modmuss50	9aa3d3e59d	Added back buildcraft support	2017-11-24 14:59:49 +00:00
modmuss50	def8cb5355	Fix dupe bug, Fixes https://github.com/TechReborn/TechReborn/issues/1342	2017-11-18 20:37:14 +00:00
冷风	1f224277e5	zh_cn.lang (#1341) ... * Update zh_cn.lang * Update zh_cn.lang * Update zh_cn.lang	2017-11-18 12:02:46 +03:00
drcrazy	64495919c0	Added config for transformers to follow IC2 style. Closes #1326	2017-11-14 14:34:14 +03:00
drcrazy	ffe115bee1	Fixed iridium oregen. Closes #1330	2017-11-13 18:29:16 +03:00
drcrazy	150fb2a2c4	Fixed iron furnace fuel slot shift-click in ugly way. Closes #968	2017-11-13 13:46:20 +03:00
drcrazy	53c8033a99	Fixed duplicate registration for basic machine frame. Closes #1340	2017-11-13 11:47:15 +03:00
drcrazy	9d1e64b1b2	Fixed texture error for fluid itemblocks.	2017-11-13 02:14:44 +03:00
drcrazy	bf5b649fc4	Removed unused code, added Override annotation	2017-11-12 12:15:32 +03:00
drcrazy	3d623292f8	Fixed more warnings	2017-11-10 12:48:01 +03:00
drcrazy	25d561c81c	Fixed imports and suppressed recipe warnings.	2017-11-10 12:27:31 +03:00
drcrazy	29d1176861	Fixed casing model with CTM enabled	2017-11-10 01:29:08 +03:00
drcrazy	41dd0468e6	Fixed CTM version of LESU Storage.	2017-11-10 01:21:59 +03:00
drcrazy	5bfe649360	Added coils check in onLoad. Closes #1337	2017-11-08 03:16:51 +03:00
drcrazy	5f2ddec821	Un-oredicted frame for grinder recipe. Closes #1331	2017-11-08 02:05:07 +03:00
drcrazy	8cacd3d8d1	Limited LESU max storage to MAX_INT FE or MAX_INT/4 EU. Closes #1328	2017-11-08 01:48:11 +03:00
drcrazy	2ff9b6950d	Fixed type in zenclass name. Closes #1332	2017-11-05 23:49:11 +03:00
modmuss50	d004ceef0e	Add lang names for new lights	2017-11-05 12:04:22 +00:00
drcrazy	19ccbd681d	Fixed itemBlock rendering. TOP\Waila are still an issue	2017-11-05 02:32:06 +03:00
Alistair Buxton	c6ac9110fe	Implement powered lighting.	2017-11-04 07:31:07 +00:00
drcrazy	18fed6b237	Fixed #texture start up error	2017-10-30 23:18:03 +03:00
drcrazy	047507f4fc	Fixed error message about #texture	2017-10-29 02:44:04 +03:00
modmuss50	2f52171a04	Still didnt fix it ;(	2017-10-27 09:40:12 +03:00
modmuss50	c0fc388a01	I tried to fix item rendering issues, but failed.	2017-10-27 09:40:11 +03:00
modmuss50	e0edff6891	Some more work on solar panels.	2017-10-27 09:40:10 +03:00
modmuss50	0aa8974035	Fix some issues with the solar panels	2017-10-27 09:40:09 +03:00
Dimmerworld	3fe609e207	Fix poweroutput	2017-10-27 09:40:08 +03:00
Dimmerworld	9972822acd	Drcrazy fixes	2017-10-27 09:40:07 +03:00
drcrazy	c7f599ead1	Merge with upstream	2017-10-27 09:39:31 +03:00
Dimmerworld	60426c4cc1	canSeeSky reduced to every 20 ticks @Modmuss request	2017-10-27 09:35:02 +03:00
Dimmerworld	37de6f6a6d	Justifications	2017-10-27 09:35:01 +03:00
Dimmerworld	d4c941cb5a	Modmuss50 changes ... ID removed Configs removed Private Enum buffer removed	2017-10-27 09:35:00 +03:00
Dimmerworld	63def52526	Hybrid texture top fix	2017-10-27 09:34:59 +03:00
Dimmerworld	5396551891	Revert "Update to latest commit(Master)"	2017-10-27 09:34:58 +03:00
Dimmerworld	8a5df0fc4b	Texture readd, classes unaltered and debug message removed	2017-10-27 09:34:57 +03:00
Dimmerworld	4307cb8258	misc fixes	2017-10-27 09:34:56 +03:00
Dimmerworld	5d0b5c3ea3	Balance, textures and items	2017-10-27 09:34:55 +03:00
Dimmerworld	4205beaead	Balance and null fix	2017-10-27 09:34:54 +03:00
Dimmerworld	9855cce93d	Upgrade merge	2017-10-27 09:34:53 +03:00
Dimmerworld	74b8246b39	More work on tile entity	2017-10-27 09:34:51 +03:00
Dimmerworld	fed439307e	Tile entity work	2017-10-27 09:34:50 +03:00
Dimmerworld	c4711848ae	Textures and block work.	2017-10-27 09:34:49 +03:00
Dimmerworld	d3ede81de4	alter	2017-10-27 09:34:48 +03:00
Dimmerworld	c651363b73	Update to latest commit(Master)	2017-10-27 09:34:47 +03:00
drcrazy	c8b6edd390	Updated LESU. Closes #1322	2017-10-26 02:26:07 +03:00
drcrazy	bae5f73d85	Refactored smelting recipes init.	2017-10-24 18:14:01 +03:00
drcrazy	440c089b5f	Fixed scrapbox list of outputs. Closes #1317. I hope )	2017-10-24 15:09:53 +03:00
drcrazy	57151a6f67	Brought back upgrades recipes in IC2 dedup mode. Closes #1302	2017-10-24 12:21:10 +03:00
drcrazy	5974ae094d	Added icons for armor slots in MFE\MFSU\etc.	2017-10-23 18:18:25 +03:00
drcrazy	c0a43c0947	Icons for armor slots	2017-10-23 16:02:58 +03:00
modmuss50	3901d60545	Some work on charging ic2 items, moving back to a proper pc.	2017-10-22 18:23:58 +01:00
modmuss50	1c6336eb68	Add grinder support to CT, closes https://github.com/TechReborn/TechReborn/issues/1318	2017-10-22 18:12:31 +01:00
drcrazy	26ddc03a65	Added background icon for upgrade slots	2017-10-21 02:07:06 +03:00
drcrazy	a57c09f633	Added ability to remove single\all scrapbox outputs. Closes #1305	2017-10-20 23:09:05 +03:00
drcrazy	30090b53dc	Small fixes to ru_ru translation	2017-10-20 12:16:58 +03:00
SkyFire55	7e4f2ebc6c	Russian language support update (#1315) ... * Russian language support update * Different translation fixes	2017-10-20 12:09:45 +03:00
drcrazy	5702e79e7a	Do net reset block break progress upon item charge. Closes #1312	2017-10-20 03:00:28 +03:00
drcrazy	441ac4887a	Made Cloaking device wearable in 1.12. Closes #1314	2017-10-20 01:58:35 +03:00
drcrazy	3f1e7b9111	Fixed transformer upgrade name. Closes #1313	2017-10-19 12:20:56 +03:00
Alistair Buxton	e43a4dbf3c	Don't place a block when opening energy store GUI.	2017-10-17 07:25:20 +01:00
drcrazy	7d7340111d	Added Distillation tower. Closes #884	2017-10-16 15:52:10 +03:00
drcrazy	4c8a9fb7e8	Textures for solar panels	2017-10-16 01:49:05 +03:00
drcrazy	c4916f5c7e	Fixed model loading errors for sapling and plates	2017-10-15 02:00:13 +03:00
drcrazy	7b4178eba8	Fixed sapling startup error message	2017-10-13 18:20:04 +03:00
drcrazy	2fd8df2118	Added CT support for plasma generator	2017-10-13 17:41:29 +03:00
drcrazy	ae1dfe4e45	Fixed warning related to deprecated JEI compat.	2017-10-13 13:31:11 +03:00
modmuss50	62251e7842	Merge remote-tracking branch 'origin/1.12' into 1.12	2017-10-13 11:07:26 +01:00
modmuss50	a26d11ee51	Fix small issue with TOP support.	2017-10-13 11:07:18 +01:00
drcrazy	47134cf2ab	Added plasma generator. Some work on #884	2017-10-13 03:20:34 +03:00
modmuss50	eb6098de5d	Re-enable retro gen support (beta), let me know of any issues. Closes #1162	2017-10-12 22:12:09 +01:00
modmuss50	09969559e8	Add fluid gen support to CT, closes #1153	2017-10-12 22:10:41 +01:00
modmuss50	46f011ef69	Remove upgrades from the dedupe list, fixes #1302	2017-10-12 21:55:41 +01:00
modmuss50	31f3aff11f	Remove ghost upgrade slots on some machines.	2017-10-12 21:51:07 +01:00
modmuss50	79984ab107	Fixes #1295	2017-10-12 21:32:53 +01:00
modmuss50	e490669405	Fixes CraftTweaker support, closes #1303	2017-10-12 21:19:51 +01:00
modmuss50	b7b9cb9963	Merge remote-tracking branch 'origin/1.12' into 1.12	2017-10-12 17:50:13 +01:00
modmuss50	984e9eb2f2	Improve TOP support	2017-10-12 17:50:03 +01:00
drcrazy	416361ff3b	Increased internal buffer for cable to x6 of transfer rate. Closes #1296	2017-10-12 18:23:50 +03:00
drcrazy	b80bf1240d	Updated cable to push energy to other cables. Closes #1296	2017-10-12 02:05:20 +03:00
modmuss50	fd5af79496	Merge remote-tracking branch 'origin/1.12' into 1.12	2017-10-11 17:42:36 +01:00
modmuss50	23ccd878bd	Fix rolling machine CT	2017-10-11 17:42:27 +01:00
drcrazy	ae27bf7b9f	Added multiblock hologram to Vacuum Freezer. Closes #1297	2017-10-11 17:24:36 +03:00
modmuss50	610c2e479e	Small tile cleanup + small fixes for potential issues.	2017-10-11 13:04:09 +01:00
modmuss50	c80cc0101f	Allow changing of the power cost view in fusion reactor recipes.	2017-10-11 12:56:29 +01:00
modmuss50	55b09da681	Fix fusion reactor not using its starting power.	2017-10-11 12:44:42 +01:00
drcrazy	79c66e2349	Suppressed warning for old upgrade slots	2017-10-11 11:28:04 +03:00
drcrazy	5d38337caa	Fixed unused variable warning	2017-10-11 11:20:42 +03:00
drcrazy	751be69426	Fixed warnings for IronAlloyFurnace (checkBurningTime, updateEntity)	2017-10-11 11:18:42 +03:00
drcrazy	5961ce5961	Fixed warning by hasContainerItem()	2017-10-11 10:52:12 +03:00
drcrazy	3945a961ef	Replaced direct FMLLog usage with LogHelper	2017-10-11 10:40:45 +03:00
drcrazy	387d4287de	Fixed warnings for VersionChecker by removing it )	2017-10-11 02:07:08 +03:00
drcrazy	8692bef2bb	Little polish to AESU GUI	2017-10-11 01:59:25 +03:00
drcrazy	e81fc202ad	Added AESU logic	2017-10-11 00:49:12 +03:00
drcrazy	58aac2ce0b	Updated AESU GUI	2017-10-10 00:13:08 +03:00
modmuss50	45d2df8650	Fix #1293 again	2017-10-09 13:23:41 +01:00
modmuss50	18be69aaf7	Improve tank server->client syncing, closes https://github.com/TechReborn/TechReborn/issues/1291	2017-10-08 19:28:52 +01:00
modmuss50	62366c8085	Fixes #1293	2017-10-08 18:58:00 +01:00
modmuss50	a590fd8ee1	Should fix #1289	2017-10-08 18:56:07 +01:00
drcrazy	1177b693f7	Fixed IDSU not charging items	2017-10-08 02:41:54 +03:00
drcrazy	350d3589c9	Fix warnings for subitemtype instead of supressing it	2017-10-08 01:59:28 +03:00
drcrazy	ca829c18cc	Added wrench support	2017-10-08 00:04:08 +03:00
drcrazy	12e2cbe11b	Fixed textformatting warnings	2017-10-07 14:39:30 +03:00
modmuss50	a80409c138	Some small tweaks to the auto crafting table, closes #1286	2017-10-04 15:19:45 +01:00
modmuss50	4e536718a3	Large changes to allow the Electrical Furnace to be upgraded	2017-10-04 13:35:58 +01:00
Modmuss50	db636be12c	Merge pull request #1285 from Dimmerworld/Scrapboxinator ... Made Scrapboxinator functional to an extent	2017-10-04 11:07:10 +01:00
Dimmerworld	28010d0790	Make scrapboxinator great again! ... Fix input/output Greatly reduced process time Removed any sign of upgrades Remove WIP tag Add crafting recipe Cleaned up unused imports Recipe: (ironplate|circuit|ironplate) (dirt|scrapbox|dirt) (ironplate|circuit|ironplate)	2017-10-04 21:02:51 +11:00
modmuss50	965d74d641	Improvements to the iron furnace, closes #1016	2017-10-04 10:12:15 +01:00
Dimmerworld	4c1d011544	Made Scrapboxinator functional to a extent ... Fix progressbar flicker(Major one) Opens the scrapbox now and has a vaild output	2017-10-04 15:37:09 +11:00
modmuss50	e5e05d0afd	Chainsaw chops down the entire tree	2017-10-03 17:39:33 +01:00
modmuss50	f00214f7de	Rewrite item power distribution to support fe. should fix #1260	2017-10-03 17:02:58 +01:00
modmuss50	81264e0fe2	Add back cable damage, closes #1150	2017-10-03 13:24:51 +01:00
drcrazy	369a19b239	Updated alloy smelter GUI to use guiBase	2017-10-03 14:44:08 +03:00
drcrazy	08c2f8921e	Add ability to insert\extract from fusion reactor. Closes #1237	2017-10-02 21:08:05 +03:00
drcrazy	0ae99ebae8	Keep state for running reactor. Closes #1187	2017-10-02 18:38:47 +03:00
drcrazy	1c57bd0100	MOre fixed warnings	2017-10-01 03:15:58 +03:00
drcrazy	1c95ca4967	Fixed warnings for Location and getStateFromMeta	2017-10-01 03:03:05 +03:00
drcrazy	1b4fee595d	Fixed warnings	2017-09-30 03:58:01 +03:00
drcrazy	b10459a288	Updated Diesel generator recipes. Closes #1279	2017-09-30 03:03:55 +03:00
drcrazy	0e5ab26cf0	Moved check for power acceptors to earlier stage. Closes #1281	2017-09-30 01:29:26 +03:00
drcrazy	bfa0c8f80a	Fixed energy usage from IDSU. Closes #1282	2017-09-30 00:45:25 +03:00
drcrazy	6f96dd7c2b	Renamed files to fix startup messages	2017-09-29 02:22:05 +03:00
modmuss50	f5076ea8af	Downgrade mappings + update all libs	2017-09-28 23:44:16 +01:00
drcrazy	4ce046a2ac	Added recipe for DragonEgg Syphon	2017-09-29 01:08:31 +03:00
modmuss50	17b09b882a	Fix build issues	2017-09-28 22:44:55 +01:00
modmuss50	8bf7bce11c	Fix merge issue	2017-09-28 21:09:15 +01:00
modmuss50	e51f3f7c51	Merge remote-tracking branch 'origin/1.12' into 1.12 ... # Conflicts: # src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java	2017-09-28 21:04:02 +01:00
modmuss50	2e1c469524	Add support for wrenches from other mods.	2017-09-28 21:01:38 +01:00
drcrazy	40e470629d	Added check for config for block break with pickaxe. Closes #1172	2017-09-28 02:03:16 +03:00
modmuss50	ffe13d0c79	Update rolling machine CT support for 1.12 closes #1251	2017-09-27 13:45:49 +01:00
drcrazy	3010afa351	Fix to-do	2017-09-27 02:56:24 +03:00
drcrazy	02473d4585	Fix warnings	2017-09-25 17:52:45 +03:00
drcrazy	ae75191c00	Fixed check for max storage for chests. Closes #1026	2017-09-22 04:03:20 +03:00
drcrazy	833974d698	Fixed inventory drop for chests. Closes #1239	2017-09-20 02:26:37 +03:00
drcrazy	8a1d9c78eb	Dirty fix for empty itemstack. Closes #1255	2017-09-19 15:11:00 +03:00
modmuss50	e74067db40	1.12.2	2017-09-18 23:47:07 +01:00
drcrazy	7ab16224a5	Fixed existing cable bug. Introduced new. Closes #1240	2017-09-18 01:25:01 +03:00
drcrazy	cd7b008430	Fixed missing ender eye and pearl grinder recipes	2017-09-17 21:00:15 +03:00
drcrazy	be88077f8c	#releaseBuild	2017-09-16 01:06:26 +03:00
drcrazy	01c04c27bb	Some machines can use batteries now	2017-09-16 00:50:43 +03:00
drcrazy	4ccd3ff290	Fixed lava check inside blast furnace multiblock	2017-09-15 02:10:55 +03:00
drcrazy	c43077e640	Fixed blast furnace double energy tap. Closes #1273	2017-09-15 01:54:09 +03:00
drcrazy	8de19ff5e7	Fix warnings	2017-09-14 17:55:28 +03:00
drcrazy	da399fc916	Fix empty check	2017-09-14 10:30:41 +03:00
drcrazy	f39026b959	JEI integration refactoring	2017-09-13 13:27:33 +03:00
drcrazy	5d441defa7	Update IndustrialElectrolyzer GUI to GuiBase. Closes #1272. ... Also started JEI refactoring	2017-09-13 03:40:38 +03:00
drcrazy	7cc8a4985f	Fix plate iridium alloy name. Closes #1271	2017-09-11 23:15:59 +03:00
modmuss50	b18f99a4dd	Fix server crash	2017-09-11 09:28:45 +01:00
drcrazy	5b09618ad2	Fix double tile entity update	2017-09-10 01:15:07 +03:00
drcrazy	b13d282bf1	Fix unused imports	2017-09-09 01:54:43 +03:00
alexpic57	c1dd9d9192	fix all? the tile to prevent bug duplication	2017-09-08 21:39:46 +02:00
alexpic57	53adc8142e	remove wrong import	2017-09-08 21:25:13 +02:00
alexpic57	885ba9210c	fix bug duplication #1012	2017-09-08 21:18:57 +02:00
alexpic57	1d873c2d33	fix identation + remove unused import + fix jei button on ImplosionCompressor	2017-09-08 13:58:27 +02:00
alexpic57	e4b5d3378a	update Implosion Compressor to GuiBase	2017-09-08 09:48:55 +02:00
drcrazy	aa2df32222	Fix build	2017-09-08 02:11:49 +03:00
drcrazy	ab1802ba5e	Refactoring for translation	2017-09-08 02:03:35 +03:00
drcrazy	8a8205b4b1	Change eupertick to 0.1. Closes #1176	2017-09-07 18:31:20 +03:00
drcrazy	e26d7e3a0c	Fixed tooltip issue. Closes #865	2017-09-07 18:29:52 +03:00
drcrazy	30ee947c22	Added player detector recipe. Removed unused imports	2017-09-07 03:17:40 +03:00
drcrazy	015fd889f2	More luv to computer cube block	2017-09-07 01:04:20 +03:00
drcrazy	bc390fa0e0	Fixed missing nuke textures	2017-09-07 00:13:37 +03:00
Modmuss50	7a55995546	Merge pull request #1265 from alexpic57/1.12 ... fix background not showing on somes machines	2017-09-06 13:48:39 +01:00
modmuss50	094b67e050	Slight rework of the gui system, should fix some issues with wrenching. Should fix #1264 fixes #988 + a handful of weird gui de-syncs	2017-09-06 13:46:12 +01:00
alexpic57	93b869a446	fix background not showing on somes machines	2017-09-06 14:42:54 +02:00
drcrazy	8588a40474	Added plateIridiumAlloy. Closes #1262. Closes #1073	2017-09-06 02:38:07 +03:00
drcrazy	71a0ac3e66	Updated recipe to use or not use oreDict names. Closes #1210	2017-09-05 23:40:40 +03:00
drcrazy	849f9fc07b	Fix null IItemstack being converted to air. I hope. Closes #1222	2017-09-05 18:02:42 +03:00
drcrazy	48c9371d77	Added missing cell recipes. Closes #867	2017-09-05 15:32:43 +03:00
drcrazy	a1c77aa47c	Merged inventory keys in blockstate jsons	2017-09-05 00:15:02 +03:00
drcrazy	dfaef8a6c2	Updated fluid generators GUI. Closes #1097	2017-09-04 00:12:58 +03:00
drcrazy	37d8b8641f	GUI rework for Diesel generator	2017-09-03 03:41:50 +03:00
drcrazy	d5a3118801	Made iridium reinforced blocks more blast resistant. Closes #1259	2017-09-02 01:30:36 +03:00
drcrazy	021a6b0077	Fix for name format. Closes #1258	2017-09-01 18:40:33 +03:00
drcrazy	207ac79b77	Change sulfur output from dust to cell. Closes #1105	2017-09-01 17:35:38 +03:00
drcrazy	07b1724e24	Updated max energy storage for several tools. Closes #1219	2017-09-01 16:19:59 +03:00
drcrazy	ace5813745	Update onBlockActivated to use newer method	2017-09-01 13:42:39 +03:00
drcrazy	ceac5fc282	Update for deprecated method	2017-09-01 02:32:05 +03:00
drcrazy	6a36f79e03	Removed duplicate coal dust grinding recipe. Closes #1256	2017-08-31 13:06:41 +03:00
drcrazy	46f9266197	Magnalium plate is back. Closes #1109	2017-08-31 03:02:00 +03:00
modmuss50	3011546462	Block energy storage now uses the new wrench api	2017-08-30 21:59:21 +01:00
modmuss50	6f6800e75a	Rewrite wrench to use new API	2017-08-30 21:57:14 +01:00
modmuss50	20e9276bd9	Fixes #1043	2017-08-30 21:25:13 +01:00
drcrazy	efbd5542b4	Code unification	2017-08-30 10:19:54 +03:00
drcrazy	ab1428eb12	Fix for machine tank drain. More luv to industrial grinder. (#1254) ... * Fix for machine tank drain. More luv to grinder Fix for empty cell drained from tank. JEI should honor power units (FE\EU) used. Fill\drain tank only two times per second in order to avoid game crash due to ticking entity.	2017-08-29 19:57:21 +03:00
drcrazy	63be913878	Fix for Industrial Grinder. Closes #1155 (#1253) ... Fix for tank issue, recipe energy consumption made equal to I\O rate, a little bit of cleanup	2017-08-28 00:38:10 +03:00
drcrazy	44524a680b	Fix alloy plate name, MFU and MFSU I\O rates (#1249) ... * Fixed name for advanced alloy plate * Fix rates and storage amount for MFE and MFSU. Closes #1205	2017-08-26 01:58:35 +03:00
drcrazy	e19e483d2f	No more excessive NBT tags for drained cells. Closes #1244, #1216 (#1248)	2017-08-25 20:57:47 +01:00
David Vierra	a016a6dd49	Replace all emptiness checks == ItemStack.Empty with .isEmpty() (#1247) ... Fixes #1157 and probably a few other things.	2017-08-25 11:08:15 -07:00
drcrazy	df808760ad	Make cells drainable again (#1246) ... * FIx unused import * Make cells drainable again * Fix deprecated warning	2017-08-25 00:39:44 -07:00
drcrazy	e814a1bf3b	More refactoring for recipes. Also closes #1225 and #1223 and #1190 (#1245)	2017-08-23 17:10:06 -07:00
drcrazy	51ee1b66ff	Update for tier0 textures. Fix for #1170 (#1242)	2017-08-22 04:04:47 -07:00
drcrazy	f465c6cf47	Refactored Crafting Table recipies; Fixed IDE warnings for unused (#1241) ... imports; Update CoFH deps to fix build	2017-08-21 14:25:13 -07:00
modmuss50	0fbc9fe04b	Merge remote-tracking branch 'origin/1.12' into 1.12	2017-08-15 19:01:41 +01:00
modmuss50	11990301d3	1.12.1	2017-08-15 19:00:37 +01:00
drcrazy	94795b7d42	Fix Vacuum Freezer wrench drop. Closes #1196 (#1235)	2017-08-14 12:46:38 +01:00
Modmuss50	ad3d13d134	Remove debug code	2017-08-14 11:56:24 +01:00
Paul	9c07d6fa1c	Fix matter fabricator energy use, adds EU-per-amp config value (#1231) ... * Fix matter fabricator energy use, adds EU-per-amp config value should compile, probably... * Also fix the output inventory access was limited to the first slot, now it isn't * oops, to much EU... that's one less 6, sorry...	2017-08-09 10:53:19 +03:00
drcrazy	aa2d15c109	Fix for issue #1218 - Can't Macerate Basalt or Marble (#1224)	2017-08-02 00:29:12 +01:00
modmuss50	77e833f9d4	Fixes #1197	2017-07-28 21:08:11 +01:00
modmuss50	0906f1fdc1	Fixes #1201	2017-07-28 21:03:12 +01:00
modmuss50	dc966c0d83	Fixes broken recipes, closes #1208	2017-07-28 21:01:08 +01:00
modmuss50	ea7baf437b	Fix small exploit with TE integration.	2017-07-28 20:28:23 +01:00
modmuss50	f4a641f3cb	Fix crash with malisis mods, #releaseBuild Fixes #1199	2017-07-19 18:23:45 +01:00
modmuss50	2f221ed8c8	Fix #992	2017-07-10 18:49:04 +01:00
modmuss50	c926f41237	Fix small issue with ore dict utils	2017-07-10 18:38:30 +01:00
modmuss50	d267bb4e09	Merge remote-tracking branch 'origin/1.12' into 1.12	2017-07-10 18:33:07 +01:00
modmuss50	b4f1031d44	Should fix crash with industrial foregoing	2017-07-10 18:32:34 +01:00
Eric Schneider	71cc854d85	Fixed spelling (#1193)	2017-07-09 20:36:41 +01:00
Eric Schneider	b178fd3442	Fixed grammar (#1192)	2017-07-09 13:13:15 +01:00
modmuss50	2206c7688a	One ingot -> 1 plate, closes #1188	2017-07-08 19:01:03 +01:00
modmuss50	de323b847a	Add Pyrotheum to fluid gen + clean up fluid handling, closes #1054	2017-07-07 00:02:14 +01:00
modmuss50	cead631367	Added a generous amount of recipes into thermal expansion, close #1110	2017-07-06 23:49:00 +01:00
modmuss50	41312c86a5	Add redgarnet recipe	2017-07-06 22:23:14 +01:00
modmuss50	b0987a3ae0	Remove invalid recipes, closes #1183	2017-07-04 16:56:53 +01:00
modmuss50	3e4cf9b93f	Fix server kicking client when using the saw mill, closes #1182 #releaseBuild	2017-07-03 21:51:17 +01:00
modmuss50	79a8fa647b	Rewrite the sawmill logic, fixes #1180	2017-07-03 20:26:55 +01:00
modmuss50	407aa3ed66	Fixes #1177	2017-07-03 19:52:28 +01:00
modmuss50	1e890ab79e	Fixes #1178	2017-07-03 19:48:21 +01:00
modmuss50	d92cbe67e1	Work on some basic advancements	2017-07-03 19:44:15 +01:00
modmuss50	3625521c20	Fixes #1179	2017-07-03 19:12:11 +01:00
Prospector	4601a27193	Update tool.json	2017-07-02 10:39:01 -07:00
modmuss50	faddc0089e	Fix rollingmachine closes #1174	2017-07-02 18:12:57 +01:00
modmuss50	2529f3fd9a	Try and prevent invalid ore dict names being registered	2017-07-01 19:27:07 +01:00
modmuss50	83a1bddf9e	Add recipes for some things that are missing them	2017-07-01 13:33:55 +01:00
modmuss50	ea158a22d4	Rename Electronic Crafting Table to Auto Crafting Table	2017-07-01 13:03:50 +01:00
modmuss50	b803f1762a	Improve machine sound	2017-07-01 13:03:04 +01:00
modmuss50	6995f42924	Work on machine sounds	2017-07-01 12:28:57 +01:00
modmuss50	5efd8daab1	Auto crafting table sound	2017-07-01 12:09:35 +01:00
modmuss50	9a7ffce98e	Nerf windmill recipes, closes #1154	2017-07-01 11:57:02 +01:00
modmuss50	a952ad1fff	Fixes iron furnace sideded issues, closes #1166	2017-07-01 11:52:33 +01:00
modmuss50	0388f97873	Revert: Small improvements to the cables	2017-06-30 13:17:06 +01:00
modmuss50	2774407307	Fix solar panel recipe	2017-06-30 13:07:46 +01:00
modmuss50	3e5f02ab4e	Small improvements to the cables	2017-06-29 17:19:34 +01:00
modmuss50	5203ad5b01	Debug tool supports FU	2017-06-29 16:44:49 +01:00
modmuss50	81aee77869	Fix energy storage blocks not rotating	2017-06-29 16:03:22 +01:00
modmuss50	4207532ded	Fixes https://github.com/TechReborn/TechReborn/issues/1160	2017-06-29 15:49:34 +01:00
modmuss50	ae71797d28	Draw default background on GUI's might help fix some issues	2017-06-29 13:11:59 +01:00
modmuss50	9edbdf5016	Closes https://github.com/TechReborn/TechReborn/issues/1158 for now	2017-06-29 12:56:33 +01:00
modmuss50	0d4fced8bb	Fixes https://github.com/TechReborn/TechReborn/issues/1159	2017-06-29 12:50:23 +01:00
modmuss50	0e8505b072	Remove reminents of core mod + fix powered items	2017-06-29 12:37:06 +01:00
modmuss50	774fec221e	Auto format code	2017-06-28 20:54:12 +01:00
modmuss50	c0aab7f37a	Update crafttweaker support	2017-06-28 20:50:00 +01:00
modmuss50	425a8d2948	Remove 2nd pass of mixin loading, and attempt to fix mixin loading outside dev	2017-06-28 09:15:22 +01:00
modmuss50	36e85c82a3	Update to support reborn core mixin changes.	2017-06-26 23:00:43 +01:00
modmuss50	ac7a4246f6	Fixes the auto crafting table, as it broke a bit with the forge update.	2017-06-26 22:30:13 +01:00
modmuss50	f2c753cf1d	Update to new forge, #releaseBuild	2017-06-26 09:40:58 +01:00
modmuss50	f56ffa9eed	Fix a bunch of issues with recipes	2017-06-25 14:15:01 +01:00
modmuss50	a774b2bcb2	Update to support forge model changes, #releaseBuild	2017-06-25 13:56:39 +01:00
modmuss50	ba644982fe	Update to support new forge registry system	2017-06-24 20:15:49 +01:00
Nourepide	c8dfcb3ba5	Fix missing names in JEI (#1149) ... * Fix missing names in GUI machines * Fix missing names in JEI	2017-06-23 14:05:44 +01:00
Nourepide	4725541a4b	Fix missing names in GUI machines (#1147)	2017-06-22 23:30:23 +01:00
modmuss50	138de281f4	Fixes issue with cable crafting, #betaBuild	2017-06-22 20:27:05 +01:00
Nourepide	81f9d46b88	Language: Fixing missing names and removing unused code	2017-06-22 20:47:42 +04:00