734 Commits

Author	SHA1	Message	Date
ThatPreston	4c8bb36c6a	Added New Seasonal Rainbow Blocks ... Added Christmas, Halloween, and Valentine's Day variants of rainbow concrete, concrete powder, and glazed terracotta.	2020-02-25 18:15:14 -06:00
ThatPreston	ab1c9318a6	Add new Rainbow Blocks ... Added Rainbow Concrete, Rainbow Concrete Powder, and Rainbow Glazed Terracotta	2020-02-25 17:53:28 -06:00
TheBusyBiscuit	15e57ffd9c	Pushing another build again	2020-02-24 00:53:13 +01:00
TheBusyBiscuit	2869a654c9	[CI skip] More Refactoring	2020-02-23 00:59:55 +01:00
TheBusyBiscuit	dcd7146949	[CI skip] Some minor changes	2020-02-22 18:54:23 +01:00
TheBusyBiscuit	51d33dee02	[CI skip] Recipe Types can now be translated as well	2020-02-22 15:41:35 +01:00
Nameless	0c3884ca91	Fix #1558	2020-02-22 18:55:09 +08:00
TheBusyBiscuit	9ca20379a2	[Ci skip] Some more refactoring	2020-02-21 22:13:38 +01:00
TheBusyBiscuit	6175cff35a	A Refactoring Supernova - You don't wanna look at the Diff	2020-02-21 21:22:26 +01:00
TheBusyBiscuit	f9f3e495e7	[CI skip] Refactoring	2020-02-21 12:09:12 +01:00
TheBusyBiscuit	155a9572c4	Fixed #1557	2020-02-21 11:00:41 +01:00
Nameless	078b506aca	Try to fix #1513	2020-02-20 11:15:06 +08:00
ThatPreston	c0af5eee77	Update SlimefunManager.java	2020-02-19 13:51:05 -06:00
TheBusyBiscuit	682755f106	Switching back to the development branch	2020-02-16 12:22:59 +01:00
TheBusyBiscuit	3226f57e8d	Pushing another stable build	2020-02-16 12:21:25 +01:00
TheBusyBiscuit	5e74657263	[CI skip] Changed the API a bit	2020-02-16 12:17:14 +01:00
TheBusyBiscuit	9510d9b1fb	[CI skip] Updated translators	2020-02-15 20:43:21 +01:00
TheBusyBiscuit	7d1e3b729e	[CI skip] Updated change log	2020-02-14 10:49:45 +01:00
Nameless	b703f176a2	Fixed magician talisman can't give book extra enchantment	2020-02-14 11:16:41 +08:00
TheBusyBiscuit	e3a778ded1	[CI skip] Updated translators list	2020-02-14 01:57:41 +01:00
TheBusyBiscuit	ecfd242c32	Merge branch 'master' into patch-2	2020-02-13 01:46:02 +01:00
Nameless	d8c29ec7bb	Double ores by drop items	2020-02-13 08:40:18 +08:00
TheBusyBiscuit	0ff1311c32	[CI skip] Updated language files and reduced technical debt	2020-02-13 01:30:27 +01:00
Nameless	ef3c1f3d10	Update TalismanListener.java	2020-02-12 21:39:42 +08:00
Nameless	c25a39c955	Avoid can't get bonus items	2020-02-12 16:43:53 +08:00
Nameless	07b7ed73fa	Fixed give more items when using fortune pickaxe	2020-02-12 14:39:16 +08:00
Nameless	c899413f7f	Forgot to import packages	2020-02-12 14:14:08 +08:00
Nameless	b87354a39e	Fixed #1516	2020-02-12 14:07:42 +08:00
TheBusyBiscuit	55b01b61f1	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2020-02-11 22:22:43 +01:00
TheBusyBiscuit	2cf5989d7a	More cleanup and Refactoring	2020-02-11 22:22:33 +01:00
TheBusyBiscuit	92ab904a41	Merge pull request #1514 from StarWishsama/patch-1 ... Fixed can't back in setting opened by command	2020-02-11 21:16:34 +01:00
TheBusyBiscuit	17cf48a773	[CI skip] Fixes #1515	2020-02-11 21:16:09 +01:00
Nameless	302a059bf8	Fixed can't back in setting opened by command	2020-02-11 15:51:10 +08:00
TheBusyBiscuit	e3a02ea52d	[CI skip] Updated /sf research	2020-02-10 18:00:14 +01:00
TheBusyBiscuit	f5dd391566	[Ci skip] Reduced cognitive complexity	2020-02-10 13:52:38 +01:00
TheBusyBiscuit	b5a7b5f5b6	[CI skip] Removed a redundancy	2020-02-10 13:45:50 +01:00
TheBusyBiscuit	fbc1726e5d	[CI skip] Added czech translators	2020-02-10 12:51:39 +01:00
TheBusyBiscuit	b916c3636b	[CI skip] A lot of internal cleanup, performance improvements	2020-02-10 12:42:34 +01:00
TheBusyBiscuit	e53746990e	[CI skip] Reduced technical debt	2020-02-09 23:13:15 +01:00
TheBusyBiscuit	3a5a18ae70	[CI skip] Moved some items to different categories	2020-02-09 13:42:21 +01:00
TheBusyBiscuit	e6c2cbf5fc	Added unfinished languages back into the development branch	2020-02-09 12:19:35 +01:00
TheBusyBiscuit	04709365a4	Finishing touches, new stable release incoming	2020-02-09 12:04:06 +01:00
TheBusyBiscuit	e0e46995af	[Ci skip] Little fix	2020-02-09 11:15:34 +01:00
Nameless	6e34f86797	Give filled knowledge flask as SlimefunItem	2020-02-09 18:10:45 +08:00
TheBusyBiscuit	9bdd961332	[CI skip] Updated bStats and CS-CoreLib2	2020-02-09 11:03:46 +01:00
TheBusyBiscuit	cefa85f451	[CI skip] Removed deprecated method	2020-02-09 00:30:31 +01:00
TheBusyBiscuit	be43f825a9	[Ci skip] Refactored Androids	2020-02-09 00:26:04 +01:00
TheBusyBiscuit	8b3b67e5c5	[CI skip] Removed deprecated method	2020-02-08 23:02:25 +01:00
TheBusyBiscuit	8b3aa8ffbe	[Ci skip] Refactoring	2020-02-08 22:58:55 +01:00
TheBusyBiscuit	55cf5a1079	[Ci skip] Improved debugging and removed a deprecated class	2020-02-08 22:42:11 +01:00
TheBusyBiscuit	447683b600	[CI skip] Refactoring	2020-02-08 20:50:21 +01:00
NihilistBrew	5674570175	small formatting	2020-02-08 13:58:01 +01:00
Poma123	4f6ca04843	Merge pull request #2 from TheBusyBiscuit/master ... Comparing new changes	2020-02-08 10:05:53 +01:00
TheBusyBiscuit	38830b3bdf	[Ci skip] Updated translators	2020-02-08 10:02:12 +01:00
poma123	9bb3fea54c	Fix PickaxeOfContainmnet bug	2020-02-08 09:57:46 +01:00
TheBusyBiscuit	f68d110a43	[Ci skip] Minor design change	2020-02-08 02:55:49 +01:00
TheBusyBiscuit	5317c46b2f	[CI skip] "a shit ton" may be an understatement	2020-02-08 02:36:57 +01:00
TheBusyBiscuit	ee695f8dee	[Ci skip] Code improvements	2020-02-06 22:31:45 +01:00
TheBusyBiscuit	ccc1048eed	[CI skip] A little bit refactoring	2020-02-06 20:38:32 +01:00
TheBusyBiscuit	df60d4c2fd	[Ci skip] Updated translators	2020-02-06 19:20:37 +01:00
TheBusyBiscuit	c33054cffd	[CI skip] Updated translators	2020-02-06 19:03:47 +01:00
TheBusyBiscuit	62e4712067	[CI skip] Updated languages	2020-02-05 23:34:17 +01:00
NihilistBrew	162a5e45f3	Update SlimefunItems.java	2020-02-05 16:13:22 +01:00
NihilistBrew	9a672b3fde	formatting	2020-02-05 15:43:13 +01:00
TheBusyBiscuit	916432c9ab	[Ci skip] Added many more languages	2020-02-05 01:40:47 +01:00
TheBusyBiscuit	f0a3ccc43c	[CI skip] Reduced technical debt, improved performance, refactoring	2020-02-04 19:05:49 +01:00
TheBusyBiscuit	81a7725396	[Ci skip] Updated translators	2020-02-04 10:41:39 +01:00
TheBusyBiscuit	c952ac6477	[Ci skip] Minor UI update	2020-02-04 00:53:30 +01:00
TheBusyBiscuit	c1d885548a	Languages now show their progress	2020-02-04 00:43:43 +01:00
TheBusyBiscuit	a864ddb59e	Added Chinese (Taiwan)	2020-02-04 00:25:54 +01:00
TheBusyBiscuit	a15b32c964	Added Chinese (Taiwan)	2020-02-04 00:23:01 +01:00
TheBusyBiscuit	cc8bb1bebb	[Ci skip] Added SlimefunBranch enum	2020-02-03 23:09:32 +01:00
TheBusyBiscuit	2ab549f7a4	[Ci skip] Some small fixes	2020-02-03 22:52:19 +01:00
TheBusyBiscuit	6f7f6c6323	Fixes #1438	2020-02-02 23:07:02 +01:00
TheBusyBiscuit	0bb8a11cd9	Fixes #1435	2020-02-02 20:20:57 +01:00
TheBusyBiscuit	7057e7fa53	Merge pull request #1433 from WalshyDev/patch-2 ... Sync up cache stuff in BlockStorage	2020-02-02 18:28:26 +01:00
TheBusyBiscuit	53345d0f8e	Some refactoring + language updates	2020-02-02 18:27:32 +01:00
Daniel Walsh	99e8f5265a	Sync up cache stuff in BlockStorage	2020-02-02 16:01:47 +00:00
TheBusyBiscuit	f870eea2a7	[Ci skip] Updated translators	2020-02-02 17:01:12 +01:00
TheBusyBiscuit	548ec3fd6a	[Ci skip] little fix	2020-02-02 16:37:59 +01:00
TheBusyBiscuit	519d59e9c8	[CI skip] Added "unsupported language" to bStats Metrics	2020-02-02 16:22:41 +01:00
TheBusyBiscuit	21fe6b691a	[Ci skip] Researches can now be translated	2020-02-02 16:11:18 +01:00
TheBusyBiscuit	b01ae9ba69	[CI skip] Added more translators	2020-02-02 15:43:41 +01:00
TheBusyBiscuit	0b8d78c1f5	[Ci skip] Added russian translators	2020-02-01 23:07:21 +01:00
TheBusyBiscuit	a7c1b3a72f	[Ci skip] Added StarWishsamas skin	2020-02-01 12:00:12 +01:00
TheBusyBiscuit	4fd6647cfd	[Ci skip] Prepare Vietnamese	2020-02-01 11:08:35 +01:00
TheBusyBiscuit	4a5eea2f03	[Ci skip] Updated translators	2020-02-01 10:55:46 +01:00
TheBusyBiscuit	ea3c95c92c	Added 5 new languages; removed some old code	2020-02-01 09:57:38 +01:00
TheBusyBiscuit	37d9f021cf	[Ci skip] Unlocked 5 more languages	2020-02-01 09:46:08 +01:00
TheBusyBiscuit	6fa0850fc2	[ci skip] little change	2020-02-01 01:41:54 +01:00
TheBusyBiscuit	ea26ac49b1	Ree... Reeeee... Reeeeeeeee... REFACTORING ... (let's hope I didn't break anything)	2020-02-01 01:32:38 +01:00
TheBusyBiscuit	73d17fd3d9	Little fix	2020-01-31 21:26:20 +01:00
TheBusyBiscuit	1b1a04cb1c	Fixed swedish translation of "swedish" :kappa:	2020-01-31 21:24:04 +01:00
TheBusyBiscuit	dada3e37a0	Added Italian, Spanish, Swedish, Hungarian, Latvian and Slovak	2020-01-31 19:54:50 +01:00
TheBusyBiscuit	c8553a161b	[Ci skip] Added a new translator	2020-01-31 11:14:50 +01:00
TheBusyBiscuit	1818da5cce	[Ci skip] Forgot one thing	2020-01-31 09:53:13 +01:00
TheBusyBiscuit	f0f3740a2c	[CI skip] Minor refactoring	2020-01-31 09:47:04 +01:00
TheBusyBiscuit	4cca09f6c9	[CI skip] Added a few more flags	2020-01-31 09:18:14 +01:00
TheBusyBiscuit	1db1168c09	[CI skip] Added more future language names	2020-01-31 00:59:36 +01:00
TheBusyBiscuit	704d3f47fa	Fixed Minecraft recipes not showing correctly	2020-01-31 00:33:05 +01:00
TheBusyBiscuit	59abc2f2e2	Added french translation	2020-01-31 00:25:01 +01:00
TheBusyBiscuit	268f39cccd	[Ci skip] Preparing for the french...	2020-01-31 00:18:19 +01:00
TheBusyBiscuit	6b7435a181	[CI skip] Added french translators	2020-01-31 00:09:57 +01:00
TheBusyBiscuit	3bdaf04c88	Fixed wrong file encodings	2020-01-30 23:48:40 +01:00
TheBusyBiscuit	aa3007ef0a	[Ci skip] Little preparation	2020-01-30 23:19:42 +01:00
TheBusyBiscuit	761d52a9c6	Slimefun can now be translated (see wiki)	2020-01-30 22:03:17 +01:00
TheBusyBiscuit	6dc0907728	[CI skip] Reduced technical debt	2020-01-29 02:25:25 +01:00
TheBusyBiscuit	b94e197f06	Fixes #1396	2020-01-28 23:42:05 +01:00
TheBusyBiscuit	2133f528a9	Possibly fixes #1313 + Performance Improvements	2020-01-28 23:36:28 +01:00
TheBusyBiscuit	1f672905d2	Fixes #1394	2020-01-28 21:05:45 +01:00
TheBusyBiscuit	4882c7e4cc	Super extreme ultra mega refactor 3000	2020-01-27 01:05:28 +01:00
TheBusyBiscuit	9f07d6b8c1	Fixes #1385	2020-01-26 11:05:37 +01:00
TheBusyBiscuit	06558541f3	Added #1387 to CHANGELOG.md	2020-01-26 03:15:10 +01:00
TheBusyBiscuit	20af3fc8ed	[CI skip] Merge pull request #1387 from BigBadE/master ... Added support for furnaces and brewing stands to cargo nets.	2020-01-26 03:08:23 +01:00
bigbade	83b97384b7	Fixed bad return	2020-01-25 20:04:01 -08:00
bigbade	f5e6a4fcad	Removed random import	2020-01-25 19:04:00 -08:00
bigbade	38b2bab35b	Removed debug statement	2020-01-25 18:44:31 -08:00
bigbade	9c8d65d654	Added support for furnaces and brewing stands to cargo nets.	2020-01-25 18:40:01 -08:00
TheBusyBiscuit	44e3fad238	[CI skip] Removed some old code	2020-01-25 19:09:49 +01:00
bigbade	669a999d01	Added comments, switched return for MagicSugar, and made MagicSugar ancient altar check pass on any dispensers/enchantment tables.	2020-01-25 09:09:58 -08:00
TheBusyBiscuit	47b0ae5d9b	Finalized Merging of Pull Request #1382	2020-01-25 17:16:16 +01:00
TheBusyBiscuit	4c58e61fcc	[CI skip] Merge pull request #1382 from BigBadE/master ... Small bug fixing	2020-01-25 17:11:22 +01:00
TheBusyBiscuit	53be0a1842	Fixed Network Particles and added a max-nodes config option	2020-01-25 14:20:58 +01:00
TheBusyBiscuit	81b80643d3	[Ci skip] Refactoring	2020-01-25 13:36:36 +01:00
TheBusyBiscuit	2d9df90b1b	[Ci skip] Minor refactoring	2020-01-25 13:11:04 +01:00
bigbade	71d4b74d72	Null checking is a good idea.	2020-01-24 19:58:10 -08:00
bigbade	4145eeb82d	Fixed formatting	2020-01-24 19:43:56 -08:00
bigbade	e49f7de412	Allowed MagicSugar to be placed on Altars.	2020-01-24 19:42:15 -08:00
bigbade	e2ff5b2b09	Fixed DebugFishListener casting BlockData of wall skulls to Rotatable instead of Directional.	2020-01-24 19:07:41 -08:00
TheBusyBiscuit	623e5a2f02	[CI skip] Refactored default-languages	2020-01-21 14:37:19 +01:00
NihilistBrew	27086b4775	Change typo	2020-01-19 15:13:20 +01:00
NihilistBrew	fbf8907181	Additional formatting	2020-01-19 12:19:13 +01:00
NihilistBrew	27b8f53db9	Normalize formatting of SlimefunSetup.java	2020-01-18 09:45:48 +01:00
TheBusyBiscuit	73b64e874e	Added more message strings, Elevators now support multiple pages	2020-01-14 20:48:04 +01:00
TheBusyBiscuit	6b53679715	Added support for multiple pages to the Elevator	2020-01-14 02:10:20 +01:00
TheBusyBiscuit	53efbf9612	[CI skip] Some more optimizations	2020-01-12 18:39:06 +01:00
TheBusyBiscuit	08f25c58a9	Performance improvements and some cleanup	2020-01-12 18:10:09 +01:00
TheBusyBiscuit	b6ca510094	[Ci skip] Merge pull request #1368 from J3fftw1/Feature/added-string ... added string to BioGenerator	2020-01-12 16:04:42 +01:00
Panda.com	0aebfdef8a	removed unused import	2020-01-12 15:36:01 +01:00
Panda.com	1ba2fd2f29	added prismarine to grindestone	2020-01-12 15:35:17 +01:00
Panda.com	eff7e9581f	added string to BioGenerator	2020-01-12 15:21:33 +01:00
TheBusyBiscuit	8a267cad3e	Fixes #1364	2020-01-12 13:14:41 +01:00
TheBusyBiscuit	51dfbaed8a	Improved performance for GEO Miner and Oil Pump	2020-01-12 11:52:20 +01:00
TheBusyBiscuit	7c993ead57	[CI skip] Refactoring	2020-01-12 11:05:35 +01:00
TheBusyBiscuit	fe6caccee9	[CI skip] More refactoring	2020-01-12 11:01:29 +01:00
TheBusyBiscuit	b94121e55b	Fixes #1366	2020-01-12 10:27:56 +01:00
TheBusyBiscuit	626a2ebdaf	Refactoring, lots of refactoring	2020-01-12 02:05:33 +01:00
TheBusyBiscuit	1cbe3f9e1f	A lot more refactoring and cleanup	2020-01-12 01:44:57 +01:00
TheBusyBiscuit	74f33764ad	[CI skip] Added a "language" variable for PlaceholderAPI	2020-01-12 00:15:40 +01:00
TheBusyBiscuit	b715de5a5c	[Ci skip] Reduced technical debt	2020-01-12 00:10:19 +01:00
TheBusyBiscuit	7bde982b8b	[CI skip] More refactoring	2020-01-12 00:02:07 +01:00
TheBusyBiscuit	ffc0fe41f0	[CI skip] Refactoring	2020-01-11 23:58:05 +01:00
TheBusyBiscuit	55269d587c	Added even more localization options	2020-01-11 23:03:35 +01:00
TheBusyBiscuit	d1a6f0c61c	Added more stuff to the messages.yml	2020-01-11 22:07:14 +01:00
TheBusyBiscuit	67bf0f9f47	[CI skip] Thanks git...	2020-01-11 20:58:14 +01:00
TheBusyBiscuit	a50756ccb2	[CI skip] Refactoring + very small performance optimization for androids	2020-01-11 20:56:33 +01:00
TheBusyBiscuit	86ec4e17ac	Fix indentation	2020-01-11 20:20:49 +01:00
TheBusyBiscuit	2e7df8acd2	Minor fix	2020-01-11 20:17:12 +01:00
TheBusyBiscuit	2dfb9ce92a	Refined and refactored Localization code	2020-01-11 20:12:53 +01:00
TheBusyBiscuit	be0035f2f9	Build 400 - Players can now select their language	2020-01-10 22:40:36 +01:00
TheBusyBiscuit	8735a8e1a3	[Ci skip] Super secret feature	2020-01-10 21:43:49 +01:00
TheBusyBiscuit	13110a4927	Added gitlocalize	2020-01-10 16:25:10 +01:00
TheBusyBiscuit	6207b6348a	Refactoring	2020-01-10 00:13:01 +01:00
TheBusyBiscuit	3fa4e1615e	[CI skip] Minor refactoring	2020-01-09 23:43:30 +01:00
TheBusyBiscuit	c375384288	Removed Solar Array	2020-01-09 23:34:06 +01:00
TheBusyBiscuit	66b573e10e	Fixes #1355	2020-01-09 23:33:11 +01:00
TheBusyBiscuit	abcd579323	Removed old and deprecated API (Addons should all have switched over...)	2020-01-06 22:48:14 +01:00
TheBusyBiscuit	ec409886a6	Another try... Pushing this to stable!	2020-01-06 20:04:39 +01:00
TheBusyBiscuit	cb73d37ed6	[CI skip] Added Fuffles_ to the contributors list.	2020-01-06 00:35:39 +01:00
TheBusyBiscuit	9033df4a16	Reworked Guide Settings (again) and reverted last change	2020-01-05 23:32:59 +01:00
TheBusyBiscuit	c05f604d4f	Fixes #1354	2020-01-05 21:50:17 +01:00
TheBusyBiscuit	ff6f160138	Updated Ore Crusher Recipes	2020-01-05 21:49:21 +01:00
TheBusyBiscuit	9ff093affa	Oil Pump now shows its "Bucket -> Oil" recipe.	2020-01-05 14:30:50 +01:00
TheBusyBiscuit	1f7e03a270	Possibly fixes #1346 and other concurrency issues	2020-01-04 16:51:25 +01:00
TheBusyBiscuit	e5fd1ad5b4	Fixed Iron Golems being repaired with slimefun ingots	2020-01-04 16:32:23 +01:00
TheBusyBiscuit	2409978b1d	Fixes #1332	2020-01-04 16:29:15 +01:00
TheBusyBiscuit	23a51b898e	A lot more refactoring + technical debt reduction + minor optimizations	2020-01-04 15:40:45 +01:00
TheBusyBiscuit	3c32ca6c60	Some cleanup	2020-01-04 13:55:33 +01:00
TheBusyBiscuit	6bae1098bc	Fixes #1344	2020-01-03 16:59:11 +01:00
TheBusyBiscuit	69267983b9	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2020-01-03 16:36:09 +01:00
TheBusyBiscuit	95adc66536	Fixed two small issues and did some cleanup	2020-01-03 16:35:55 +01:00
TheBusyBiscuit	e0b240f570	Reduced technical debt	2020-01-03 16:33:58 +01:00
TheBusyBiscuit	5b86ef1e7e	Merge pull request #1339 from mohkamfer/AutomatedCraftingChamberCraftLast ... Enable Automated Crafting Chamber To Craft Last Shaped Recipe	2020-01-03 14:42:57 +01:00
TheBusyBiscuit	89d55430fb	Radioactive items have a new lore!	2020-01-03 14:41:15 +01:00
TheBusyBiscuit	1b0d507783	Updated Radioactive - lore. You may need to convert some items...	2020-01-03 13:57:56 +01:00
Muhammad Kamal	667ec595ee	Refactor getSerializsedInput()'s if conditions	2020-01-03 14:52:34 +02:00
Muhammad Kamal	e8a79a7c3a	Refactor tick()'s if condition	2020-01-03 14:50:02 +02:00
TheBusyBiscuit	34a56a1bb6	Simplified some lore utilities	2020-01-03 13:33:21 +01:00
Muhammad Kamal	fc007273bb	Fix ItemStack Amounts Greater Than 1	2020-01-03 14:10:32 +02:00
Muhammad Kamal	9d246adf93	Reformat Code	2020-01-03 14:04:43 +02:00
TheBusyBiscuit	84604752e3	[CI skip] Little file size optimization I guess?	2020-01-03 02:20:36 +01:00
Muhammad Kamal	f8c2983491	Enable Automated Crafting Chamber To Craft Last Shaped Recipe	2020-01-01 00:02:47 +02:00
TheBusyBiscuit	3773460561	Fixes #1337	2019-12-30 01:25:05 +01:00
TheBusyBiscuit	e90b8c18f7	[CI skip] Reduced technical debt	2019-12-30 01:21:47 +01:00
TheBusyBiscuit	b74479327a	[CI skip] Reduced technical debt	2019-12-30 01:18:09 +01:00
TheBusyBiscuit	1c0e36f6f1	[CI skip] Optimized and refactored some android code	2019-12-30 01:01:09 +01:00
TheBusyBiscuit	a817903a04	[CI skip] Updated dependencies	2019-12-29 22:13:00 +01:00
TheBusyBiscuit	b8a94e22e5	[CI skip] Some refactoring	2019-12-29 18:30:48 +01:00
TheBusyBiscuit	e2d58f7f50	Several changes, won't list em all	2019-12-29 14:14:51 +01:00
TheBusyBiscuit	8db990f56c	[CI skip] Fixed pages for main menu	2019-12-29 00:05:30 +01:00
TheBusyBiscuit	39292ae9ce	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-12-28 12:43:01 +01:00
TheBusyBiscuit	784ad0b195	Fixes #1295	2019-12-28 12:42:39 +01:00
AlexLander123	586437b16d	Fix Basic Circuit Board not dropping	2019-12-28 14:35:39 +08:00
TheBusyBiscuit	8b3d1fedcb	[CI skip] Minor tweaks	2019-12-27 16:43:23 +01:00
TheBusyBiscuit	9a3d79781b	[CI skip] Reduced technical debt	2019-12-27 11:38:54 +01:00
TheBusyBiscuit	687e97f8e9	Minecraft recipe will now scroll through all available items (e.g. wood)	2019-12-27 11:10:22 +01:00
TheBusyBiscuit	2a06c2e215	Slimefun Guide now shows ALL minecraft recipes, with pages	2019-12-27 02:16:01 +01:00
TheBusyBiscuit	5dc19aedc3	[CI skip] Excluded github-actions from the contributors list	2019-12-26 23:30:28 +01:00
TheBusyBiscuit	3a19350323	Added Kelp Cookies (because why not?)	2019-12-26 21:26:04 +01:00
TheBusyBiscuit	336b26759a	[CI skip] Some minor changes	2019-12-26 21:10:03 +01:00
TheBusyBiscuit	f7bfff2f37	Players can now toggle their research-fireworks in the guide	2019-12-26 21:01:51 +01:00
TheBusyBiscuit	d2ac50be38	Overhauled Guide Settings	2019-12-26 20:52:15 +01:00
TheBusyBiscuit	b7776e73b4	Minor performance improvement	2019-12-26 20:29:20 +01:00
TheBusyBiscuit	4efb53b705	Minor changes	2019-12-26 20:22:28 +01:00
TheBusyBiscuit	5933bc6367	Reduced technical debt	2019-12-26 19:56:58 +01:00
TheBusyBiscuit	249af4001b	Fixes #1325	2019-12-26 19:49:53 +01:00
TheBusyBiscuit	7183350e1a	Some code cleanup	2019-12-26 18:36:21 +01:00
TheBusyBiscuit	0efc51c7ea	Fixed Category constructor	2019-12-26 18:30:40 +01:00
TheBusyBiscuit	129b98dff6	Lots of refactoring, implemented a suggestion	2019-12-23 20:38:55 +01:00
TheBusyBiscuit	bd610a9f94	Fixes #1298	2019-12-23 19:39:35 +01:00
TheBusyBiscuit	0e0859e73a	[CI skip] Another minecraft alias	2019-12-23 00:39:03 +01:00
TheBusyBiscuit	2edf5db140	[CI skip] Added bverhoevens and BurningBrimstones minecraft alias	2019-12-22 23:51:43 +01:00
TheBusyBiscuit	b5dd2f329a	[CI skip] Reduced technical debt, lots of refactoring	2019-12-22 23:00:05 +01:00
TheBusyBiscuit	5a0b994a4f	Fixes #1318	2019-12-22 14:03:52 +01:00
TheBusyBiscuit	997c682a00	Refactoring + Allowed custom models for UI elements	2019-12-22 14:00:35 +01:00
coco0325	2ceb9d6d45	Update OilPump.java	2019-12-22 17:08:44 +08:00
coco0325	4d63bffc72	Update OilPump.java	2019-12-22 15:31:53 +08:00
coco0325	87b8035b34	Corrected OliPump.java	2019-12-22 01:46:56 +08:00
coco0325	ff0016ad0e	Update OilPump.java	2019-12-22 01:32:20 +08:00
coco0325	2fd2dae403	Revert "TW-1" ... This reverts commit 687516cfae.	2019-12-22 01:18:12 +08:00
coco0325	7d0d222f79	Update OilPump.java	2019-12-22 01:16:43 +08:00
coco0325	060051623d	Merge remote-tracking branch 'upstream/master'	2019-12-22 01:08:49 +08:00
coco0325	687516cfae	TW-1	2019-12-22 01:07:58 +08:00
TheBusyBiscuit	bee2375757	Removed Nether Drill (+ some micro-optimizations)	2019-12-21 16:46:17 +01:00
TheBusyBiscuit	429c280095	Fixes #1316	2019-12-21 15:42:07 +01:00
TheBusyBiscuit	a89b9ff467	[CI skip] Fine, I'll do it myself, Thanos said	2019-12-19 23:26:40 +01:00
TheBusyBiscuit	97d72e0a8d	[CI skip] Merge pull request #1294 from BurningBrimstone/master ... Added recipes	2019-12-19 23:25:03 +01:00
TheBusyBiscuit	f9b12dfed5	[CI skip] Improved Cargo Performance a lot (breaks Barrels though)	2019-12-19 23:22:09 +01:00
TheBusyBiscuit	f7fa6e2972	[CI skip] Reduced technical debt and tweaked Magnesium Salt	2019-12-18 01:07:04 +01:00
TheBusyBiscuit	331b9b64a7	[CI skip] Merge pull request #1310 from J3fftw1/feature/gravel-to-sand ... added a way to automate sand production	2019-12-17 23:08:19 +01:00
J3fftw1	b1ae5c9047	added a way to automate sand production	2019-12-17 23:03:56 +01:00
TheBusyBiscuit	33adb7e79a	Added Magnesium Salt and Magnesium-powered Generator	2019-12-17 01:37:09 +01:00
TheBusyBiscuit	59fb83e871	[CI skip] Removed CS-CoreLib Auto-Installer and reduced technical debt	2019-12-17 00:44:41 +01:00
TheBusyBiscuit	5730907da3	Merge pull request #1308 from creator3/master ... Fix drops in 1.15	2019-12-17 00:19:10 +01:00
TheBusyBiscuit	989ed45a02	Added Salt to the GEO Miner (and reduced technical debt)	2019-12-17 00:18:04 +01:00
creator3	d698840e1f	Use the actual tool item in calls to getDrops()	2019-12-16 11:47:47 -05:00
creator3	8b177df6c8	Fix drops in 1.15	2019-12-16 11:21:31 -05:00
TheBusyBiscuit	7268fb0505	[CI skip] Some more refactoring	2019-12-12 02:52:24 +01:00
TheBusyBiscuit	7cb0c521f6	[CI skip] Some refactoring	2019-12-12 01:45:55 +01:00
TheBusyBiscuit	aa9652cf88	Fixed Credits erroring for invalid usernames	2019-12-12 00:22:00 +01:00
TheBusyBiscuit	a91d926698	Re-formatted pom.xml	2019-12-12 00:20:01 +01:00
TheBusyBiscuit	db5f10ffe8	Fixed Credits + Reduced technical debt	2019-12-12 00:16:28 +01:00
TheBusyBiscuit	d66d34e85b	Merge branch 'master' into support/1.15	2019-12-11 23:15:33 +01:00
TheBusyBiscuit	3976e427a0	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-12-11 23:14:25 +01:00
TheBusyBiscuit	1ee411e4ca	[CI skip] Reduced and Increased technical debt	2019-12-11 23:13:51 +01:00
Daniel Walsh	32be167679	Support 1.15	2019-12-11 16:41:00 +00:00
BurningBrimstone	642f5fe464	Added Ore Block Recipes ... Added following recipes to the electric press: Diamond -> Diamond Block Redstone -> Redstone Block Lapis -> Lapis Block Gold -> Gold Block Iron -> Iron Block	2019-12-11 00:56:19 -05:00
TheBusyBiscuit	460270f2a9	Merge pull request #1292 from SoSeDiK/kt ... Reworked & Fixed Knowledge Tome and a minor researching tweak	2019-12-10 11:27:33 +01:00
TheBusyBiscuit	f74c078f61	Merge pull request #1293 from NihilistBrew/patch-1 ... Grind andesite, granite, diorite to gravel	2019-12-10 11:26:57 +01:00
TheBusyBiscuit	fd8a77dd79	Merge pull request #1288 from ramdon-person/patch-1 ... Added Soulbound Trident	2019-12-10 11:26:44 +01:00
TheBusyBiscuit	cdef18c8d7	[CI skip] Little improvement	2019-12-10 11:21:09 +01:00
TheBusyBiscuit	4c593760ba	[CI skip] Some minor changes to metrics	2019-12-10 11:10:53 +01:00
TheBusyBiscuit	c8cc7818b2	[CI skip] Added two more contributor names, some refactoring	2019-12-10 11:00:04 +01:00
SoSeDiK	ac80575d8f	Optimized item check	2019-12-10 09:55:56 +02:00
ramdon_person	052f80eeac	Update SlimefunSetup.java	2019-12-09 23:24:51 -08:00
BurningBrimstone	c879e5ebb7	Updated Quartz Namespace ID ... Changed NETHER_QUARTZ to QUARTZ.	2019-12-09 13:19:09 -05:00
BurningBrimstone	60f16ee4ac	Added recipes ... Added recipes for iron and gold nuggets into their respective ingots. Also added a recipe for quartz into quartz blocks. https://discordapp.com/channels/565557184348422174/627048923122499584/652563773793763343	2019-12-09 12:40:51 -05:00
NihilistBrew	3d8add777a	Grind andesite, granite, diorite to gravel ... From https://discordapp.com/channels/565557184348422174/565569155848208404/650406015246008339	2019-12-09 16:50:25 +01:00
TheBusyBiscuit	6c4c9cdc17	Some minor optimization	2019-12-09 09:52:49 +01:00
SoSeDiK	f0d04c75d8	Removed unnecessary action	2019-12-08 23:12:11 +02:00
SoSeDiK	27a8aa6236	Tweaked instant researching ... Don't start researching when it's instant, just throw fireworks & message about completion	2019-12-08 22:55:17 +02:00
SoSeDiK	ce5ca5146e	Reworked Knowledge Tome	2019-12-08 22:45:03 +02:00
SoSeDiK	912d2e9d7f	Fixed duplicate Grind Stone recipes	2019-12-08 17:44:02 +02:00
SoSeDiK	9b5bcfde44	Updated Crucible's mechanics	2019-12-08 15:24:22 +02:00
TheBusyBiscuit	ec44688459	Improved SlimefunItemStack#clone()	2019-12-08 13:09:15 +01:00
TheBusyBiscuit	8e72577974	Another optimization	2019-12-08 13:03:01 +01:00
TheBusyBiscuit	021bb3cbc8	Item optimizations	2019-12-08 12:59:55 +01:00
TheBusyBiscuit	39082938a8	Optimized items even further	2019-12-08 12:58:50 +01:00
TheBusyBiscuit	a22068b9ff	Optimized SlimefunManager.isItemSimilar	2019-12-08 12:58:05 +01:00
TheBusyBiscuit	4699d6b94d	[Ci skip] Another little change	2019-12-08 10:48:41 +01:00
TheBusyBiscuit	d12253c2f2	[Ci skip] Some small changes	2019-12-08 10:07:51 +01:00
TheBusyBiscuit	e5da69eb30	Merge pull request #1287 from WalshyDev/fix/contributors ... Allow for different GH and MC names + small improvements	2019-12-08 09:31:06 +01:00
ramdon_person	17cf8cecdc	Update ResearchSetup.java	2019-12-07 12:30:38 -08:00
ramdon_person	c48cf894d4	Update SlimefunSetup.java	2019-12-07 11:56:11 -08:00
coder4321	4b8c948ad6	Update SlimefunSetup.java	2019-12-07 10:11:16 -08:00
coder4321	2281393a8b	Update SlimefunSetup.java	2019-12-07 10:09:50 -08:00
Daniel Walsh	f1ee2bd092	Added @NihilistBrew	2019-12-07 12:59:56 +00:00
coder4321	05f2751d58	Added Soulbound Trident	2019-12-07 01:25:34 -08:00
TheBusyBiscuit	72916b3e4f	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4	2019-12-07 10:05:11 +01:00
TheBusyBiscuit	f25bf75d67	Added Nether Gold Pan to the Electric Gold Pan	2019-12-07 10:04:54 +01:00
coder4321	f90f1c609f	[CI skip] Updated Teleport Sounds and Fixed The “color codes are supported text” for elevators (#1283) ... * Update TeleportationSequence.java * Update TeleportationSequence.java * Update Elevator.java	2019-12-07 09:41:26 +01:00
Daniel Walsh	cafc78b3fe	Revert 5b9e9a4fb7	2019-12-06 21:47:18 +00:00
Daniel Walsh	5b9e9a4fb7	*screams internally*	2019-12-06 21:45:06 +00:00
Daniel Walsh	9156d478ef	Add ajan-12 and LinoxGH	2019-12-06 21:35:17 +00:00
Daniel Walsh	3f179f9eaa	oops, revert dis	2019-12-06 21:03:56 +00:00
Daniel Walsh	724c550204	Pasting is a true gem	2019-12-06 20:57:17 +00:00
Daniel Walsh	73a9eddf7f	Fixed up ... Now doesn't accept special chars and added imgbot	2019-12-06 20:56:03 +00:00
Daniel Walsh	a112e43b42	Allow for different GH and MC names + small improvements	2019-12-06 20:08:20 +00:00
TheBusyBiscuit	bcbe16253e	Search now shows the Category of an Item	2019-12-06 14:20:42 +01:00
TheBusyBiscuit	43033ec3a4	Fixes #1280	2019-12-06 08:39:43 +01:00
SoSeDiK	a294e0db1f	Fixes #1281	2019-12-04 17:57:38 +02:00
SoSeDiK	732ae5e0dc	Added a new constructor ... Allows using the new item system.	2019-12-04 13:35:08 +02:00
TheBusyBiscuit	da1dd294f6	Fixed Output Chest	2019-12-04 00:04:34 +01:00
TheBusyBiscuit	0fd7892ca4	Fixed blocks turning into CSCoreLib heads for all newly placed ... non-ticking blocks.	2019-12-03 20:20:33 +01:00
TheBusyBiscuit	ae2a75b1d1	[CI skip] Merge pull request #1263 from poma123/patch-1 ... AndroidMineEvent	2019-12-03 00:37:23 +01:00
J3fftw1	c2230f1763	fixes dupe with geominer	2019-12-02 23:14:22 +01:00
poma123	1ddd46768e	Changed android getter & updated javadocs	2019-12-02 16:21:55 +01:00
J3fftw1	5e52a5d3ab	actually fixes it now ... removed if (list.size() % 2 != 0) list.add(null);	2019-12-02 15:58:33 +01:00
poma123	426dd64a2b	Added android getter and some javadocs	2019-12-02 15:15:48 +01:00
TheBusyBiscuit	8183a1a5af	Fixes #1269	2019-12-01 20:55:46 +01:00
TheBusyBiscuit	958a3c0429	Fixed IllegalArgumentException for second-page credits	2019-12-01 19:22:23 +01:00
TheBusyBiscuit	2c64adc536	[CI skip] Minor UI change	2019-12-01 19:18:02 +01:00
TheBusyBiscuit	4ffc2888fd	Fixed credits now showing everyone	2019-12-01 19:16:27 +01:00
TheBusyBiscuit	78df2e3ea5	Added Electric Press	2019-12-01 19:08:32 +01:00
TheBusyBiscuit	15d1d708f6	Fixed guide showing incomplete recipes for some machines	2019-12-01 18:59:14 +01:00
TheBusyBiscuit	20cdda2845	Fixed multi tools again	2019-12-01 18:42:33 +01:00
TheBusyBiscuit	3a608cfe4f	Fixed multi tools	2019-12-01 18:39:37 +01:00
TheBusyBiscuit	accb018b22	Reduced a bit more technical debt	2019-12-01 18:37:43 +01:00
TheBusyBiscuit	b4faad9a72	Reduced technical debt on MultiTools	2019-12-01 18:35:15 +01:00
TheBusyBiscuit	b5cc48fd9b	Changed Grappling Hook Recipe	2019-12-01 18:24:52 +01:00
TheBusyBiscuit	135fe34221	Merge pull request #1275 from J3fftw1/fix/fix-guide-issue-reeee ... Fixes #1272 & #1273	2019-12-01 16:58:02 +01:00
TheBusyBiscuit	51b347afe8	Changed a few category icons	2019-12-01 16:54:59 +01:00
TheBusyBiscuit	552c907f21	Fixed some christmas items	2019-12-01 16:54:50 +01:00
J3fftw1	90bcc2196c	Fixes #1272 & #1273	2019-12-01 16:28:57 +01:00
TheBusyBiscuit	dbab114d8f	Possibly fixes #1266	2019-11-30 01:00:24 +01:00
TheBusyBiscuit	ae74412fac	Enhanced randomizer algorithm for Gold Pans	2019-11-30 00:58:35 +01:00
TheBusyBiscuit	41327d637c	Added new API class	2019-11-30 00:44:44 +01:00
TheBusyBiscuit	d5482f5496	[CI skip] Some additional API work	2019-11-28 20:23:39 +01:00
TheBusyBiscuit	6312d6c431	Merge pull request #1270 from pentabulge/master ... Updated recipes for Automated Panning Machine	2019-11-28 19:36:53 +01:00
TheBusyBiscuit	3a809ad5ab	Merge pull request #1268 from SoSeDiK/researches ... Changed loading order	2019-11-28 19:36:38 +01:00
TheBusyBiscuit	015159dfe8	Fixes #1264	2019-11-28 19:35:28 +01:00
TheBusyBiscuit	95e5da325b	Restructured a bit of the API (for future versions)	2019-11-28 19:34:43 +01:00
penta	ebe9375a80	Added Iron Nuggets & Soul Sand drops to recipes	2019-11-28 17:34:12 +01:00
poma123	19b604f1de	Added javadocs to #getBlock	2019-11-27 17:39:08 +01:00
poma123	88f5d412e5	Event calling added into "movedig"	2019-11-27 17:35:58 +01:00
SoSeDiK	b39a08d557	Changed loading order ... Fixes researching not being enabled by default when starting the server for the first time	2019-11-27 18:29:45 +02:00
SoSeDiK	f63c290041	Minor changes to formatting ... - Fixed color - Removed empty lines - Changed formatting according to the other pages in the guide	2019-11-27 18:23:11 +02:00
poma123	b069f9c354	Added AndroidMineEvent	2019-11-26 22:46:00 +01:00
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