1372 Commits

Author	SHA1	Message	Date
LinoxGH	40caa2d574	Update ResearchSetup.java	2020-10-08 16:02:53 +03:00
LinoxGH	b5c917f719	Fixed the lore.	2020-10-08 16:00:26 +03:00
LinoxGH	4bf08db1d1	Merge branch 'master' into EnergyConnector	2020-10-08 15:53:08 +03:00
TheBusyBiscuit	26066f2e6c	Refactoring	2020-10-08 14:45:21 +02:00
TheBusyBiscuit	01d233af4d	Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix ... GPS Control Panel and GEO Scanner access checks	2020-10-08 14:37:16 +02:00
NCBPFluffyBear	90ccbb2261	Organized imports	2020-10-07 17:37:41 -05:00
NCBPFluffyBear	b577c1e4a3	Did changes	2020-10-07 13:45:49 -05:00
TheBusyBiscuit	126ccf3d01	Formatting	2020-10-07 18:43:55 +02:00
TheBusyBiscuit	7c3fc99b3a	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... tags Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java	2020-10-07 18:38:26 +02:00
TheBusyBiscuit	fc26f959b6	[CI skip] Small formatting correction	2020-10-07 18:30:21 +02:00
TheBusyBiscuit	e4ddc7c452	[CI skip] Enforce OTBS.	2020-10-07 18:27:01 +02:00
poma123	cd00848795	Merge branch 'master' into tags	2020-10-07 17:55:26 +02:00
TheBusyBiscuit	ed8f0e243b	Fixes #2405	2020-10-07 17:48:53 +02:00
TheBusyBiscuit	c3302d8cbd	Merge branch 'master' into tags	2020-10-07 17:44:27 +02:00
LinoxGH	eb572a1a77	Merge branch 'master' into EnergyConnector	2020-10-07 18:10:50 +03:00
TheBusyBiscuit	78515a3c61	Merge pull request #2396 from svr333/AddSticksRecipeToTableSaw ... Add sticks recipe to table saw	2020-10-07 16:31:58 +02:00
TheBusyBiscuit	20a9c642fe	Some code cleanup	2020-10-07 16:24:14 +02:00
poma123	7814bdcdee	Merge branch 'master' into tags	2020-10-07 16:11:41 +02:00
TheBusyBiscuit	80c4242dd7	Merge pull request #2384 from Seggan/master ... Added Elytra Cap	2020-10-07 16:01:45 +02:00
svr333	85091516db	Add generic fail message	2020-10-07 12:12:02 +02:00
NCBPFluffyBear	37f0715156	Added permission checks for the GEO Scanner and GPS Control Panel	2020-10-06 19:46:22 -05:00
Seggan	1ccd4c14ac	More changes...	2020-10-06 15:41:14 -04:00
Seggan	960d53840a	Moved import	2020-10-06 15:39:15 -04:00
Seggan	20aa5d49dc	Merged ifs	2020-10-06 15:34:37 -04:00
Seggan	d1ede58f85	More requested changes...	2020-10-06 15:12:35 -04:00
TheBusyBiscuit	47590ac972	Merge branch 'master' into tags	2020-10-06 21:07:49 +02:00
TheBusyBiscuit	07c84af3b5	Added NotConfigurable attribute	2020-10-06 21:01:18 +02:00
TheBusyBiscuit	f98d048b55	[CI skip] Reduced technical debt	2020-10-06 20:20:02 +02:00
svr333	fa394b4d44	Call planks.isPresent()	2020-10-06 19:50:57 +02:00
svr333	e6ed632dd0	Refactor + undo placeholder item in displayrecipes	2020-10-06 11:53:51 +02:00
svr333	37242fe64a	Throw out variables	2020-10-06 01:26:23 +02:00
Seggan	db6295616e	Did more requested changes	2020-10-05 17:05:05 -04:00
Seggan	a4dc1428bc	Changed protection check (untested)	2020-10-05 17:02:09 -04:00
svr333	8c44c583cf	Add nullable tag	2020-10-05 23:01:30 +02:00
svr333	6e17cd2cc5	Extract to method	2020-10-05 23:00:44 +02:00
Seggan	4b3e31a8c7	Renamed listener	2020-10-05 16:56:25 -04:00
svr333	997dce8970	Extract to method && remove redundant if statement	2020-10-05 20:07:56 +02:00
Senne Van Rompaey	94c5068cc2	Move version check ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-05 20:03:50 +02:00
svr333	038efb8391	Add myself @author	2020-10-05 20:00:31 +02:00
svr333	3ef0a67db6	Add @Nonnull	2020-10-05 19:59:55 +02:00
svr333	9242978a96	Remove redundant if-else && Consume item after output	2020-10-05 19:57:50 +02:00
svr333	ff0c2b7984	Change else if to else	2020-10-05 19:37:12 +02:00
svr333	868a7e566b	Change else if to else	2020-10-05 19:34:26 +02:00
svr333	b237d076bf	Add version check	2020-10-05 19:34:00 +02:00
svr333	983bc103d3	Refactor	2020-10-05 18:43:11 +02:00
svr333	fe50d96270	Remove empty line	2020-10-05 18:38:58 +02:00
svr333	62aa2dd0d8	Simplify displayrecipes and use planks.isTagged()	2020-10-05 17:23:40 +02:00
Senne Van Rompaey	8675e96e75	Add space ... Co-authored-by: LinoxGH <54643600+LinoxGH@users.noreply.github.com>	2020-10-05 17:11:56 +02:00
Seggan	58e2b9ab3b	Added default annonation	2020-10-05 11:01:58 -04:00
Seggan	bb24bdd837	Merge remote-tracking branch 'upstream/master'	2020-10-05 10:55:26 -04:00
svr333	0e57d94d61	Add Sticks recipe to Table Saw	2020-10-05 16:28:23 +02:00
svr333	b3ca362df2	Add DisplayRecipes	2020-10-05 16:06:19 +02:00
Seggan	51dd53cae1	Moved elytra cap to magical gadgets	2020-10-05 10:01:38 -04:00
svr333	0a19f76787	Use PigZombie over Entity	2020-10-05 15:56:54 +02:00
svr333	b8c2c97766	Add missing import	2020-10-05 15:43:24 +02:00
svr333	6c568bd7d1	Fix imports	2020-10-05 15:38:21 +02:00
svr333	8d3f432158	Use instanceof	2020-10-05 15:37:45 +02:00
svr333	3ca6e612cc	Add @nonnull	2020-10-05 15:33:48 +02:00
svr333	ab5251021a	Fix compile error	2020-10-05 15:30:23 +02:00
svr333	e65341eb0b	Add newline	2020-10-05 15:29:02 +02:00
svr333	a2fb390a8e	Extra code to separate methods	2020-10-05 15:28:43 +02:00
svr333	a01d33fea3	Refactor	2020-10-05 15:25:11 +02:00
svr333	21bf7cf607	Refactor slightly	2020-10-05 15:00:21 +02:00
svr333	ab92df7693	Fix imports	2020-10-05 14:58:53 +02:00
svr333	e1488c0811	Add Zombified piglin conversion	2020-10-05 14:56:40 +02:00
svr333	5ec63f632f	Update lore	2020-10-05 14:20:44 +02:00
Seggan	7f1bddb759	Merge branch 'text_revisions'	2020-10-04 22:05:22 -04:00
Seggan	3dcd5942aa	Changed some linguistic things (Biscuit needs to be an English professor)	2020-10-04 22:03:48 -04:00
Seggan	d6df2ea00c	Added crash protection type	2020-10-04 21:59:10 -04:00
Seggan	8bbef4c911	Did some requested changes	2020-10-04 16:08:42 -04:00
Seggan	f87a1d3660	Added research check	2020-10-04 15:07:11 -04:00
Seggan	107125802c	Forgot to change id. Reverted back to setDamage()	2020-10-04 15:02:21 -04:00
Seggan	1dbdd077ec	Updated recipe	2020-10-04 14:43:30 -04:00
Seggan	70be1c38d0	Did requested changes	2020-10-04 14:42:50 -04:00
TheBusyBiscuit	b32dc0b727	@poma123 for the rescue	2020-10-04 13:40:41 +02:00
TheBusyBiscuit	655b429f0d	Added a new super tag	2020-10-04 13:31:52 +02:00
TheBusyBiscuit	76e42fa9af	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags	2020-10-04 13:17:13 +02:00
TheBusyBiscuit	5753def8e9	Hey unit tests, you work now, k pls?	2020-10-04 12:42:59 +02:00
TheBusyBiscuit	c8d2bea162	Maybe now? 👀	2020-10-04 12:16:32 +02:00
b10n1k	91a5b56947	Define a constant instead of duplicating "backpacks."	2020-10-04 12:09:04 +02:00
TheBusyBiscuit	ceadd2147f	Added a debug line to finally fix this unit test	2020-10-04 11:51:03 +02:00
TheBusyBiscuit	2ff105dabe	Maybe fixed the unit tests?	2020-10-04 11:22:56 +02:00
TheBusyBiscuit	4df4f6d4c9	More Climbing Pick unit tests which may give us better context?	2020-10-04 11:04:35 +02:00
LinoxGH	7dffd84687	Update ResearchSetup.java	2020-10-04 09:06:21 +03:00
LinoxGH	38f891ca98	Some code improvements. ... (at least that's what was meant to be done)	2020-10-04 09:01:24 +03:00
TheBusyBiscuit	50777ac546	A bit of code cleanup and docs	2020-10-04 02:55:11 +02:00
TheBusyBiscuit	8bbdc37130	Refactored Climbing Picks and added Tags	2020-10-04 02:28:59 +02:00
TheBusyBiscuit	0e6fc92e28	Merge branch 'master' into tags	2020-10-04 00:46:37 +02:00
TheBusyBiscuit	de17060070	Merge pull request #2383 from LinoxGH/SfGuideEvent ... Added SlimefunGuideOpenEvent.	2020-10-04 00:40:15 +02:00
TheBusyBiscuit	87196ef3b9	Merge pull request #2385 from Mooy1/master ... Speed can affect enchanter/disenchanter times, fixed pom typo	2020-10-04 00:40:01 +02:00
LinoxGH	dbe8755e4a	Update src/main/java/io/github/thebusybiscuit/slimefun4/api/events/SlimefunGuideOpenEvent.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2020-10-04 01:04:41 +03:00
Mooy1	e33c70e189	removed accidental space	2020-10-03 16:33:29 -05:00
Mooy1	766d0bbc53	Speed can affect enchanter/disenchanter times, fixed pom typo	2020-10-03 16:27:54 -05:00
Seggan	d9aceea4d6	Changed recipe	2020-10-03 17:27:22 -04:00
LinoxGH	ca76411c40	Update SlimefunGuideListener.java	2020-10-04 00:26:29 +03:00
LinoxGH	2ed707b3b3	Update SlimefunGuideOpenEvent.java	2020-10-04 00:25:27 +03:00
Seggan	99e0c542ae	Moved crash helmet item declaration	2020-10-03 17:22:03 -04:00
Seggan	b540bc05bc	Crash helmet now works	2020-10-03 17:20:29 -04:00
LinoxGH	f7c3a5b052	Did some more requestes changes.	2020-10-04 00:09:52 +03:00
LinoxGH	4316f83a00	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/SlimefunGuideListener.java ... Co-authored-by: poma123 <25465545+poma123@users.noreply.github.com>	2020-10-04 00:06:20 +03:00