3901 Commits

Author	SHA1	Message	Date
Martin Brom	8e13b41a34	Reorder conditions to prevent a possible version error	2021-07-10 00:18:03 +02:00
Martin Brom	7285277707	Add the option to prevent IndustrialMiner from mining deepslate ores	2021-07-09 23:59:27 +02:00
TheBusyBiscuit	e58a6219ff	Merge pull request #3151 from Apeiros-46B/master ... Add Amethyst Block -> 4 Amethyst Shard recipe to grindstone	2021-07-09 12:13:38 +02:00
Lil_BC	5fe8dff05e	Added My Minecraft Name	2021-07-08 11:54:04 -04:00
EpicPlayerA10	3e48012d8f	Sort imports correctly	2021-07-08 12:36:34 +02:00
EpicPlayerA10	c148c8b4da	Added SlimefunUtils.spawnItem instead of dropItemNaturally	2021-07-08 12:33:53 +02:00
EpicPlayerA10	dd343e8e73	Merge branch 'Slimefun:master' into master	2021-07-08 12:20:19 +02:00
TheBusyBiscuit	5a1442f13a	Added SlimefunItemSpawnEvent and ItemSpawnReason ... This allows other plugins to provide compatibility in some places	2021-07-08 11:17:56 +02:00
TheBusyBiscuit	e19f291904	Merge pull request #3145 from martinbrom/fix/mining-task-world-height ... Allow IndustrialMiner to mine when minWorldHeight is lower than 0	2021-07-08 10:42:28 +02:00
EpicPlayerA10	e8c99044c5	Merge branch 'Slimefun:master' into master	2021-07-07 10:15:31 +02:00
The Busy Bot	2c55eacbe3	[CI skip] New locale updates from Crowdin	2021-07-07 09:58:43 +02:00
Apeiros-46B	214dc533a5	Add Amethyst Block -> 4 Amethyst Shard recipe to grindstone	2021-07-06 02:49:22 -07:00
The Busy Bot	0fdd6edb00	[CI skip] New locale updates from Crowdin	2021-07-06 10:42:21 +02:00
LilBC	5ca97bcd09	Update src/main/resources/languages/en/messages.yml ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2021-07-05 08:52:24 -04:00
LilBC	55f777eb17	Merge branch 'Slimefun:master' into master	2021-07-04 21:40:23 -04:00
EpicPlayerA10	b6b83ca974	Changed doc	2021-07-04 12:30:17 +02:00
LilBC	564a1a0905	Update src/main/resources/languages/en/messages.yml ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2021-07-04 01:27:35 -04:00
LilBC	74fba2e1f5	Corrected Inverted Unlocked Recipe Check ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2021-07-04 00:35:19 -04:00
EpicPlayerA10	f56ef90dbf	More cleanup	2021-07-03 22:02:00 +02:00
EpicPlayerA10	a2d38c3a05	Code Cleanup	2021-07-03 21:56:47 +02:00
EpicPlayerA10	26b897391a	Change from Dispenser to Container	2021-07-03 21:54:16 +02:00
EpicPlayerA10	0128d57af0	Move code to superclass and call method in other machines	2021-07-03 21:36:15 +02:00
Martin Brom	c93dea06ed	Allow IndustrialMiner to mine when minWorldHeight is lower than 0	2021-07-03 12:06:59 +02:00
LilBC	ebfb7904b7	Reordered Codes	2021-07-02 09:24:10 -04:00
LilBC	7a40027937	Made Error Message More Informative	2021-07-02 09:14:59 -04:00
LilBC	36894894be	Changed Naming ... Changed recipe-unavailable to recipe-unavailable.	2021-07-02 09:02:19 -04:00
LilBC	680511ee11	Fix hasUnlockedRecipe and Bad Imports	2021-07-02 08:58:53 -04:00
The Busy Bot	101139bb2f	[CI skip] New locale updates from Crowdin	2021-07-02 14:09:11 +02:00
LilBC	0b2c3dba83	Add files via upload	2021-07-01 18:46:59 -04:00
LilBC	a922e2e8cc	Add files via upload	2021-07-01 18:16:13 -04:00
LilBC	28eec7b101	Add files via upload	2021-07-01 18:15:42 -04:00
LilBC	5a7a151a17	Add files via upload	2021-07-01 16:12:22 -04:00
LilBC	2f74d01312	Add files via upload	2021-07-01 15:10:19 -04:00
LilBC	013907900d	Add files via upload	2021-07-01 15:09:40 -04:00
LilBC	65070dc42e	Add files via upload	2021-07-01 14:34:27 -04:00
LilBC	b01b90d0d0	Add files via upload	2021-07-01 12:45:54 -04:00
LilBC	cbae3b9d73	Add files via upload	2021-07-01 12:44:23 -04:00
The Busy Bot	c31962565d	[CI skip] New locale updates from Crowdin	2021-07-01 12:55:05 +02:00
TheBusyBiscuit	51bfbbd653	Merge pull request #3119 from svr333/AddTridentCrafting ... Add Trident recipe	2021-06-30 23:35:12 +02:00
Martin Brom	45ee78a0eb	Code style	2021-06-30 18:27:57 +02:00
svr333	7109873c16	Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2021-06-28 17:00:32 +02:00
Martin Brom	3bdd32b26d	Fix regex to only match "Use" and "Uses", not "Usess..."	2021-06-28 12:33:59 +02:00
Martin Brom	9cab256e2b	Add back singular version of "uses left" lore line ... Update regex to match both the plural and singular version	2021-06-28 12:26:47 +02:00
Martin Brom	55683b15b3	Remove newline ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2021-06-28 12:12:36 +02:00
Senne	369efa6be3	Resolve merge conflict	2021-06-28 10:59:09 +02:00
Senne	c16e444995	Split up if statements	2021-06-28 10:57:17 +02:00
Pawel Lesiak	6a09b29764	Caching getInventory	2021-06-27 15:25:19 +02:00
Martin Brom	fc197ac1d1	Make the uses left suffix a constant	2021-06-26 22:21:37 +02:00
Martin Brom	ca1222c239	Forgot to remove unused imports...	2021-06-26 22:00:24 +02:00
Martin Brom	4fc940198d	Use endsWith instead of regex	2021-06-26 21:56:13 +02:00
Martin Brom	c95f9aed0a	Move uses left lore regex into PatternUtils ... Make NamespacedKeys in LimitedUseItem and StormStaff non-static	2021-06-26 16:42:14 +02:00
EpicPlayerA10	05c11a633a	Added support for multiple output chests	2021-06-26 11:16:34 +02:00
EpicPlayerA10	66dc68ac5e	Cleanup	2021-06-26 10:29:28 +02:00
EpicPlayerA10	be4a4df832	Merge branch 'master' into master	2021-06-26 10:12:56 +02:00
TheBusyBiscuit	25dea3daf6	Fixed #2966 ... This fix was salvaged from PR #2968	2021-06-26 00:21:01 +02:00
TheBusyBiscuit	b9f64bdebc	Deepslate ores can now be doubled using an Ore Crusher	2021-06-26 00:05:43 +02:00
TheBusyBiscuit	65142d1204	[CI skip] Some code cleanup	2021-06-26 00:02:43 +02:00
EpicPlayerA10	0d5870296b	Fix disappearing items with output chest	2021-06-25 20:53:03 +02:00
TheBusyBiscuit	f5b5fc2f4e	Merge pull request #3118 from svr333/AddDiamondGrinding ... Add diamond -> coal conversion	2021-06-25 19:16:13 +02:00
TheBusyBiscuit	10764555d3	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java	2021-06-25 19:12:23 +02:00
svr333	037747983c	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java ... Co-authored-by: Semisol <git@smileycreations15.com>	2021-06-23 10:26:29 +02:00
NgLoader	5aeb3e8c84	fix: fixed tab ... chore: renamed MultiBlockBreakEvent to PlayerBlockBreakEvent feat: added AndroidBlockBreakEvent	2021-06-22 02:24:21 +02:00
NgLoader	bd85eab39c	feat: added MultiBlockBreakEvent	2021-06-21 23:33:48 +02:00
NgLoader	1308f0c5a9	chore: updated EventHandler arguements	2021-06-21 21:56:41 +02:00
NgLoader	0e6d7604d7	fix: fixed tabs	2021-06-21 21:40:56 +02:00
NgLoader	e88cffde8c	chore: added method description	2021-06-21 21:29:49 +02:00
NgLoader	9919549c7e	Merge branch 'master' of github.com:NgLoader/Slimefun4	2021-06-21 21:15:38 +02:00
NgLoader	282f9e0e43	feat: added orebfuscator integration	2021-06-21 21:13:49 +02:00
Senne	7ed4441849	Add subconversion	2021-06-21 20:03:45 +02:00
Senne	60b803c64c	Make trident recipe expensive	2021-06-21 19:54:05 +02:00
Martin Brom	93de94d036	Use Regex to find the correct "Uses left" line ... Make LimitedUseItem::setMaxUseCount return LimitedUseItem	2021-06-21 15:34:36 +02:00
TheBusyBiscuit	57f7553f74	Merge pull request #3126 from Slimefun/chore/recommend-java-16 ... Encourage Java 16 on older versions	2021-06-21 14:30:10 +02:00
EpicPlayerA10	fe9cdb3a77	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/IcyBow.java ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2021-06-18 17:24:17 +02:00
EpicPlayerA10	e14c63ce76	Add a freeze effect on the icy bow	2021-06-18 17:14:36 +02:00
EpicPlayerA10	31d0589733	Add a freeze effect on the icy bow	2021-06-18 17:14:21 +02:00
EpicPlayerA10	55d8d9fdcd	Add a freeze effect on the icy bow	2021-06-18 17:13:21 +02:00
BuildTools	1c4d2db8ec	Add a freeze effect on the icy bow	2021-06-18 16:59:51 +02:00
TheBusyBiscuit	96574bed6f	Fixes #3116	2021-06-18 15:09:03 +02:00
TheBusyBiscuit	805c2eafcc	Added a new feature to the debug fish ... SlimefunTag support	2021-06-18 15:08:24 +02:00
TheBusyBiscuit	069896ff66	Switch to WARNING	2021-06-17 11:21:28 +02:00
TheBusyBiscuit	7fcb605d4d	Encourage Java 16 on older versions	2021-06-17 10:53:38 +02:00
Senne	919166cb80	Replace 1 water rune with nether star	2021-06-15 16:34:58 +02:00
Martin Brom	04e99e7e64	Change LimitedUseItem count to use setters instead ... Fix annotations	2021-06-15 12:06:59 +02:00
Senne	0e851f7be5	Add trident recipe	2021-06-14 14:56:48 +02:00
Senne	7865ad92fc	Add diamond -> 24 coal conversion	2021-06-14 14:29:58 +02:00
svr333	ffcb8d7146	Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2021-06-14 14:20:16 +02:00
Martin Brom	0cde52331e	Add LimitedUseItem - base class for items with limited uses ... Update StormStaff to extend LimitedUseItem Add 'usesLeft' function to LoreBuilder	2021-06-13 13:27:38 +02:00
TheBusyBiscuit	59a548ef66	[CI skip] Make javadocs happy	2021-06-12 15:59:10 +02:00
TheBusyBiscuit	1d052bda9c	Some formatting	2021-06-12 00:31:42 +02:00
TheBusyBiscuit	7008e36e68	Added new spawn eggs	2021-06-12 00:29:26 +02:00
TheBusyBiscuit	15da49392a	Updated ore tags	2021-06-12 00:21:31 +02:00
Daniel Walsh	6b6883ca4e	Variable for minHeight	2021-06-11 16:10:26 +01:00
Daniel Walsh	8912ca1ea0	Improve loop in SeismicAxe	2021-06-11 15:58:38 +01:00
Daniel Walsh	ea98a3e5a3	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SeismicAxe.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2021-06-11 15:36:51 +01:00
Daniel Walsh	2513b71e6f	Final changes	2021-06-11 15:30:20 +01:00
Daniel Walsh	ede931cdcd	Create WorldUtils	2021-06-11 13:41:19 +01:00
Daniel Walsh	1e1889b66d	Goats can produce milk	2021-06-11 13:33:21 +01:00
Daniel Walsh	196c5d4e97	Fix tag for 1.17 (maybe??)	2021-06-11 11:44:48 +01:00
Daniel Walsh	408468ce6a	Add min y to elevator and seismic axe	2021-06-11 11:37:04 +01:00
Daniel Walsh	d065951b9f	1.17 recipes provided by martin	2021-06-11 11:24:09 +01:00