6954 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
TheBusyBiscuit	13b7f05fd9	Merge pull request #3171 from StarWishsama/fix/talisman-anvil-offhand ... Fixes Talisman of anvil break main hand item in special case	2021-07-17 19:06:43 +02:00
TheBusyBiscuit	9f1db49c67	[CI skip] Updated changelog	2021-07-17 19:06:20 +02:00
TheBusyBiscuit	53413747f2	Merge pull request #3117 from martinbrom/chore/limited-use-item ... Add LimitedUseItem - base class for items with limited uses	2021-07-17 18:54:16 +02:00
TheBusyBiscuit	09ff10da94	[CI skip] Merge pull request #3173 from Slimefun/renovate/com.konghq-unirest-java-3.x ... Update dependency com.konghq:unirest-java to v3.11.12	2021-07-15 11:55:30 +02:00
StarWishsama	03ab985033	refactor: optimize slot check	2021-07-15 16:43:13 +08:00
Renovate Bot	5c0775e4c6	Update dependency com.konghq:unirest-java to v3.11.12	2021-07-14 20:43:07 +00:00
StarWishsama	17d7521115	chore: revert order change	2021-07-14 11:10:25 +08:00
StarWishsama	22155edd71	refactor: optimize check method	2021-07-14 11:08:59 +08:00
StarWishsama	a0e6628acc	fix(talisman): use correct slot number	2021-07-13 11:10:06 +08:00
StarWishsama	0d4502e739	fix(talisman): add validate for offhand to avoid fix wrong item	2021-07-13 10:57:39 +08:00
TheBusyBiscuit	89ac634113	[CI skip] Updated readme	2021-07-12 17:32:50 +02:00
Daniel Walsh	6392af004f	Merge pull request #3168 from guizhanss/feature/more-in-ore-crusher ... Adds deepslate iron, gold, copper ores, and copper ore to Ore Crusher	2021-07-12 11:43:41 +01:00
Daniel Walsh	7c8d168694	Merge pull request #3169 from guizhanss/feature/miner-outcome ... Allow the Industrial Miner to produce raw ores rather than ore blocks	2021-07-12 11:42:40 +01:00
TheBusyBiscuit	b5c2732c2c	[CI skip] Updated changelog	2021-07-12 12:26:08 +02:00
ybw0014	2085e92410	restore comment	2021-07-12 04:04:24 +08:00
ybw0014	f9e84b65ba	remove duplicated codes	2021-07-12 00:26:46 +08:00
ybw0014	ba80281210	Change format	2021-07-11 23:01:10 +08:00
ybw0014	ab6da98697	Changes outcomes for industrial miner	2021-07-11 22:25:07 +08:00
ybw0014	6be06f07f6	Adds deepslate iron, gold, copper ores, and copper ore to Ore Crusher	2021-07-11 22:22:56 +08:00
TheBusyBiscuit	a94d26edfc	Merge pull request #3163 from martinbrom/feature/miner-deepslate-option ... Add the option to prevent IndustrialMiner from mining deepslate ores	2021-07-10 12:33:18 +02:00
TheBusyBiscuit	ad2e0f3dbc	[CI skip] Updated changelog	2021-07-10 12:33:11 +02:00
TheBusyBiscuit	0fdca470e4	[CI skip] Merge pull request #3165 from Slimefun/renovate/me.clip-placeholderapi-2.x ... Update dependency me.clip:placeholderapi to v2.10.10	2021-07-10 12:32:13 +02:00
Martin Brom	11ba156bb3	Change the default value for canMineDeepslateOres to true	2021-07-10 09:07:53 +02:00
Renovate Bot	795a4c02db	Update dependency me.clip:placeholderapi to v2.10.10	2021-07-10 05:05:25 +00:00
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
TheBusyBiscuit	5279ddc67b	[CI skip] Updated changelog	2021-07-09 12:13:25 +02:00
TheBusyBiscuit	04e2fab457	[CI skip] Merge pull request #3159 from LilBC/patch-2 ... Added My Minecraft Name to The Contributor List	2021-07-09 12:12:32 +02:00
TheBusyBiscuit	e1e75ab2d7	[CI skip] Merge pull request #3160 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-1.x ... Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.5.0	2021-07-09 12:12:06 +02:00
Renovate Bot	03e10830d1	Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v1.5.0	2021-07-08 18:59:52 +00:00
Lil_BC	5fe8dff05e	Added My Minecraft Name	2021-07-08 11:54:04 -04: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
TheBusyBiscuit	56a70e66bc	[CI skip] Updated changelog	2021-07-08 10:42:10 +02:00
The Busy Bot	2c55eacbe3	[CI skip] New locale updates from Crowdin	2021-07-07 09:58:43 +02:00
TheBusyBiscuit	6971e4225c	[Ci skip] Fixed sonarcloud workflow	2021-07-06 12:55:15 +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
TheBusyBiscuit	84262c5600	Merge pull request #3142 from LilBC/master ... Fix Vanilla Auto Crafter Being Able to Craft Disabled Items	2021-07-05 15:15:41 +02:00
TheBusyBiscuit	9cd221a67a	[CI skip] Fixed typo	2021-07-05 15:14:18 +02:00
TheBusyBiscuit	e0179dbfc7	[CI skip] Updated changelog	2021-07-05 15:14:00 +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
TheBusyBiscuit	c5f509a331	[CI skip] Run the maven-compiler workflow for pull requests targeting any branch	2021-07-05 13:00:04 +02:00
LilBC	55f777eb17	Merge branch 'Slimefun:master' into master	2021-07-04 21:40:23 -04:00
TheBusyBiscuit	1806b3399f	[CI skip] Updated workflows	2021-07-04 13:18:47 +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
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