2588 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Hillcox	d89e3f5d1d	fix: all the porting :D	2021-08-22 22:19:57 +01:00
Michael Hillcox	518ee0b4c1	feat: official mappings & updated to FG 5.1+	2021-08-22 16:09:06 +01:00
Michael Hillcox	79e8791223	chore: more commenting out	2021-05-09 20:58:05 +01:00
Michael Hillcox	e8b797bac3	feat: helper methods, cleanup and builder fixes	2021-05-05 18:05:24 +01:00
Michael Hillcox	a7c9655586	Merge remote-tracking branch 'origin/1.16' into 1.16	2021-05-05 17:46:10 +01:00
Michael Hillcox	8edd6de4d2	feat: added wrapper for builders in recipes	2021-05-05 17:44:52 +01:00
Flanks255	785c4b7460	Finished the quartz recipes... i think... ... Atomic Reconstructor...	2021-05-05 11:34:43 -05:00
Flanks255	7ef9492778	Moar recipes....	2021-05-05 11:15:25 -05:00
Flanks255	354a118a1f	More Recipes. ... renamed Ethetic Quartz Blocks.	2021-05-05 10:21:00 -05:00
Michael Hillcox	420188975e	feat: port growth ring, hairball, knife, laser wrench, magnet ring	2021-05-04 18:50:50 +01:00
Michael Hillcox	c87bfb6c94	feat: ported bat wings, solidified experience, resonant rice, probe	2021-05-04 17:47:45 +01:00
Flanks255	2419a0e860	The Great-Renaming continues...	2021-05-02 11:10:21 -05:00
Flanks255	ff86e624b4	Much Renaming...	2021-05-02 10:47:50 -05:00
Flanks255	f655001bb6	Fixed MiscBlock registrations.	2021-05-02 10:14:25 -05:00
Flanks255	80488b501e	Initial Block/Item Recipe generator classes. ... Recipes for Battery box / Farmer done.	2021-05-01 17:51:36 -05:00
Flanks255	0146333e37	TeleStaff "Should" be ready...	2021-05-01 16:05:32 -05:00
Michael Hillcox	62b1859abb	chore: SO MUCH PORTING!	2021-04-19 20:20:23 +01:00
Michael Hillcox	cf608e9f16	chore: minor fixes before bed	2021-03-01 20:34:05 +00:00
Michael Hillcox	996bf66a65	chore: ported hairy ball handler :wtf:	2021-03-01 20:30:45 +00:00
Michael Hillcox	86ff9fb641	chore: ported most item constructors...	2021-03-01 20:23:52 +00:00
Michael Hillcox	4919a5cbba	chore: minor refactor fixes	2021-03-01 19:58:15 +00:00
Michael Hillcox	dcdac11e2b	chore: ported most parts of the Gui's	2021-03-01 19:55:50 +00:00
Michael Hillcox	4dfe0e04bb	chore: all blocks ported!	2021-03-01 19:14:50 +00:00
Michael Hillcox	0e4a65354f	chore: some blocks ported and INamedProviders added to tiles	2021-03-01 17:46:12 +00:00
Michael Hillcox	fcb150ebaf	chore: containers ported mostly, gui's ported for comparability	2021-03-01 17:11:34 +00:00
Michael Hillcox	cb650b6689	chore: utils mostly ported, misc ported, deprecation's added, specials ported mostly	2021-03-01 16:25:30 +00:00
Michael Hillcox	6f34f82f4e	chore: so much block porting	2021-02-28 14:47:54 +00:00
Michael Hillcox	97bc966606	chore: a few blocks, containers, etc ported over	2021-02-28 11:33:01 +00:00
Michael Hillcox	d39cdb5de8	chore: renders ported, blocks now ActuallyBlocks, removed requested blocks	2021-02-28 10:35:10 +00:00
Michael Hillcox	d25e2fdea3	chore: gui & booklet porting	2021-02-27 21:59:18 +00:00
Michael Hillcox	a200f9aa6a	chore: porting work, api package ported, micro ports here and there	2021-02-27 21:44:00 +00:00
Michael Hillcox	e0391bbf87	chore: item porting work	2021-02-27 20:24:26 +00:00
Michael Hillcox	7cd34c5360	chore: minor porting and removing files	2021-02-27 16:35:21 +00:00
Michael Hillcox	32f7a3915f	chore: blocks & micro porting	2021-02-27 16:22:03 +00:00
Michael Hillcox	71ddbd9abb	chore: ported over most tile entities	2021-02-27 15:33:00 +00:00
Michael Hillcox	ecb7832738	chore: moved over most tile and block register to deferred variant	2021-02-27 12:24:45 +00:00
Michael Hillcox	b7d4d600fc	chore: large refactors to new mappings	2021-02-26 21:15:48 +00:00
Michael Hillcox	12206a03a3	Yeet	2020-11-21 18:16:09 +00:00
Michael Hillcox	1e259e3f62	This should fix the maven builds	2020-11-21 18:08:07 +00:00
Michael Hillcox	ba6b00ffb9	Fine, don't work then.	2020-11-20 18:02:53 +00:00
Michael Hillcox	ede65d042d	Attempt 2.4	2020-11-20 17:59:03 +00:00
Michael Hillcox	99c8aa4a9d	Attempt 2.3	2020-11-20 17:55:16 +00:00
Michael Hillcox	08b1ac049a	Attempt 2.2	2020-11-20 17:46:34 +00:00
Michael Hillcox	45bbe23f5a	Updated changelog and modified the build gradle for jenkins	2020-11-20 16:58:55 +00:00
Michael Hillcox	e0c3024400	Merge pull request #1345 from jammehcow/bugfix/1332 ... Fix bounding box NPE when placing worm item	2020-11-20 16:39:06 +00:00
Michael Hillcox	0a0dc76b88	Merge pull request #1340 from Falcion/patch-1 ... Updated Russian translation.	2020-11-20 16:38:52 +00:00
Michael Hillcox	c49c73e15c	Merge pull request #1346 from CrankySupertoon/1.12.2 ... Crystal Flux Localization	2020-11-20 16:25:58 +00:00
Cranky Supertoon	1726dac78f	Finish Crystal Flux Localization ... Signed-off-by: Cranky Supertoon <crankysupertoon@gmail.com>	2020-11-15 12:12:10 -05:00
Cranky Supertoon	26650447de	Finish Crystal Flux Localization ... Signed-off-by: Cranky Supertoon <crankysupertoon@gmail.com>	2020-11-15 12:10:12 -05:00
Ell	9a15bee50f	fixed 1.12 maven publish	2020-11-07 14:38:30 +01:00