2195 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
J3fftw1	eea32be7dd	removed empty lines	2019-11-26 19:30:52 +01:00
J3fftw1	23202d1cd6	few more fixes	2019-11-26 19:29:13 +01:00
J3fftw1	80094b4f1b	Merge branch 'master' into qol/sf-version	2019-11-26 19:26:44 +01:00
J3fftw1	334a1058b4	merged latest master	2019-11-26 19:16:39 +01:00
J3fftw1	b220f3a39e	added cscorelib version to the guide	2019-11-26 19:00:35 +01:00
TheBusyBiscuit	61a58d87dd	Added Iron Nuggets to Gold Pan drops	2019-11-26 00:48:47 +01:00
TheBusyBiscuit	c9bd5840e0	Added Nether Gold Pan	2019-11-26 00:39:54 +01:00
TheBusyBiscuit	85227f0814	Merge pull request #1258 from NiekWilting/fix-titles ... Fixed the getTitle method.	2019-11-24 14:28:10 +01:00
Niek Wilting	1f9cbc0b13	Fixed the getTitle method.	2019-11-24 14:11:34 +01:00
TheBusyBiscuit	0a44fa5671	Revamped Guide Settings Menu	2019-11-24 13:23:16 +01:00
TheBusyBiscuit	7ad4d92a14	[CI skip] Added Slimefun Guide and Recipe Types to custom item model ... service	2019-11-22 14:57:04 +01:00
TheBusyBiscuit	8a605404c1	Added "Flint to Cobblestone" Recipe to the Compressor	2019-11-21 20:36:50 +01:00
TheBusyBiscuit	62e67609f9	[Ci skip] Updated issues script	2019-11-19 22:35:29 +01:00
TheBusyBiscuit	a00cdbcfc2	[CI skip] Another test	2019-11-19 00:05:56 +01:00
TheBusyBiscuit	3266e4c65e	[CI skip] Added automated Issues responses	2019-11-19 00:01:21 +01:00
TheBusyBiscuit	ff8275797a	[Ci skip] Another test	2019-11-18 23:47:19 +01:00
TheBusyBiscuit	db865b85de	[CI skip] Testing something	2019-11-18 23:46:16 +01:00
TheBusyBiscuit	28ed785cf7	Merge pull request #1247 from J3fftw1/research/jerk ... added jerkys to research	2019-11-17 21:31:44 +01:00
J3fftw1	1ac713cb58	Update ResearchSetup.java	2019-11-17 21:31:10 +01:00
TheBusyBiscuit	b1950447d6	Added more wiki pages to the guide	2019-11-17 21:30:39 +01:00
J3fftw1	f33218c10e	Update ResearchSetup.java	2019-11-17 21:29:59 +01:00
J3fftw1	8cb7108c27	reeeeeeeee sowwe	2019-11-17 18:49:06 +01:00
J3fftw1	a6129e65e9	fixed the tabs and changed jerky to jerky's ... crossing fingers for correct use of '	2019-11-17 18:45:50 +01:00
J3fftw1	4b044cba16	fixed suggested changes	2019-11-17 18:26:54 +01:00
J3fftw1	152dcac0c7	fixed the changes SoSeDiK suggested/requested	2019-11-17 11:19:37 +01:00
J3fftw1	29543f4a2a	changes	2019-11-16 23:48:30 +01:00
TheBusyBiscuit	c9b678f1a0	Merge pull request #1248 from WalshyDev/patch-2 ... Fix #1229	2019-11-16 23:11:36 +01:00
Daniel Walsh	1569f7e05e	Fix #1229	2019-11-16 22:06:26 +00:00
J3fftw1	4a83ecca07	added jerkys to research	2019-11-16 20:08:46 +01:00
TheBusyBiscuit	0a08690ae9	Merge pull request #1244 from poma123/patch-1 ... AutoDisenchantEvent	2019-11-16 17:47:32 +01:00
Poma123	87caf6ee45	Update AutoDisenchantEvent.java	2019-11-16 17:03:56 +01:00
Poma123	da0fe57ab7	Update AutoDisenchantEvent.java	2019-11-16 16:58:27 +01:00
Poma123	918d9c3506	Update AutoDisenchanter.java	2019-11-16 16:36:45 +01:00
Poma123	212b7cffd3	Update AutoDisenchantEvent.java	2019-11-16 16:35:22 +01:00
Poma123	72a7f4598f	Update and rename DisenchanterEvent.java to AutoDisenchantEvent.java	2019-11-16 16:34:14 +01:00
Poma123	201159f3bf	Update AutoDisenchanter.java	2019-11-16 16:29:59 +01:00
Poma123	537fc57f48	Update AutoDisenchanter.java	2019-11-16 16:27:15 +01:00
Poma123	d18adecb9a	Update DisenchanterEvent.java	2019-11-16 16:26:28 +01:00
Poma123	fa57e61447	Update AutoDisenchanter.java	2019-11-16 15:50:52 +01:00
Poma123	6f3bf2db13	Update DisenchanterEvent.java	2019-11-16 15:49:06 +01:00
Poma123	c6428c0e4b	Update AutoDisenchanter.java	2019-11-16 14:09:09 +01:00
Poma123	f0c0919bce	Add DisenchanterEvent	2019-11-16 14:08:38 +01:00
TheBusyBiscuit	fcf9b547c1	Merge pull request #1230 from SoSeDiK/transmitters ... Transmitters	2019-11-16 14:08:22 +01:00
TheBusyBiscuit	09ab124e36	Added Output Chest support to the Table Saw	2019-11-10 20:18:06 +01:00
SoSeDiK	78c81bafdb	Merge branch 'master' into transmitters	2019-11-10 21:04:50 +02:00
TheBusyBiscuit	7890edd295	Added Output Chest Support to the Automated Panning Machine	2019-11-10 19:44:53 +01:00
TheBusyBiscuit	a10fe1e514	Fixed custom model data	2019-11-10 18:54:53 +01:00
TheBusyBiscuit	40616ee47e	Merge pull request #1239 from TheBusyBiscuit/custom-textures ... Added support for custom item models	2019-11-10 18:52:36 +01:00
TheBusyBiscuit	97d8ce1546	Moved CoreProtect integration to CS-CoreLib2	2019-11-10 18:52:18 +01:00
TheBusyBiscuit	3e30ce8d14	Reduced technical debt	2019-11-10 18:43:37 +01:00