5999 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
TheBusyBiscuit	7a2586bfcb	[CI skip] Updated changelog	2020-11-03 09:41:32 +01:00
TheBusyBiscuit	f3d6c01300	[CI skip] Merge pull request #2530 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x ... Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.152	2020-11-03 09:40:29 +01:00
TheBusyBiscuit	74e24ce9f1	[CI skip] Ooops	2020-11-03 00:56:43 +01:00
TheBusyBiscuit	c67f431614	[CI skip] I am amazed that this actually worked :o	2020-11-03 00:56:30 +01:00
TheBusyBiscuit	d038950a5d	[Ci skip] Test	2020-11-03 00:53:17 +01:00
Renovate Bot	9789c5e46d	Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.0	2020-11-02 23:30:09 +00:00
Renovate Bot	15b0bb1303	Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.152	2020-11-02 23:30:00 +00:00
uiytt	54ebfbb18c	Last formatting fix	2020-11-02 20:06:03 +01:00
TheBusyBiscuit	d69cf78331	Merge branch 'master' into MoreTalismans	2020-11-02 15:12:56 +01:00
TheBusyBiscuit	1c5f2f650b	Some refactoring and small fixes	2020-11-02 15:10:56 +01:00
TheBusyBiscuit	be001baa6e	[CI skip] Merge pull request #2508 from Sfiguz7/master ... Smallest documentation fix ever	2020-11-02 12:38:37 +01:00
Sfiguz7	22fd9e549f	Removed link from brewing stand	2020-11-02 01:04:53 +01:00
TheBusyBiscuit	25c3368ad3	Merge branch 'master' into code-quality/abstract-classes	2020-11-01 21:06:35 +01:00
TheBusyBiscuit	8536965962	Fixes #2517	2020-11-01 20:59:34 +01:00
TheBusyBiscuit	1141a01fd0	Fixes #2519	2020-11-01 20:46:29 +01:00
TheBusyBiscuit	6ced4d166e	Fixes #2527	2020-11-01 20:12:34 +01:00
TheBusyBiscuit	e64cd9c140	[CI skip] Merge pull request #2525 from Slimefun/gitlocalize-13996 ... Chinese Taiwan 10/31	2020-10-31 17:42:14 +01:00
TheBusyBiscuit	a383ecb713	[CI skip] Merge pull request #2526 from Slimefun/renovate/com.konghq-unirest-java-3.x ... Update dependency com.konghq:unirest-java to v3.11.03	2020-10-31 17:23:53 +01:00
Renovate Bot	83cfcde657	Update dependency com.konghq:unirest-java to v3.11.03	2020-10-31 14:49:43 +00:00
HeroBrineKing	519140ede6	Translate resources_zh-TW.yml via GitLocalize	2020-10-31 11:50:41 +00:00
HeroBrineKing	36460ed11f	Translate researches_zh-TW.yml via GitLocalize	2020-10-31 11:50:40 +00:00
HeroBrineKing	7ecdbbc97d	Translate recipes_zh-TW.yml via GitLocalize	2020-10-31 11:50:39 +00:00
HeroBrineKing	11eddd117f	Translate messages_zh-TW.yml via GitLocalize	2020-10-31 11:50:37 +00:00
TheBusyBiscuit	935a36cfbd	Translate messages_zh-TW.yml via GitLocalize	2020-10-31 11:50:36 +00:00
HeroBrineKing	5fafac0f84	Translate categories_zh-TW.yml via GitLocalize	2020-10-31 11:50:35 +00:00
TheBusyBiscuit	7fc4e1ef91	[CI skip] Merge pull request #2524 from Slimefun/gitlocalize-13992 ... Updated korean translations	2020-10-31 10:18:34 +01:00
TheBusyBiscuit	3bf7dfc1c3	Update recipes_ko.yml	2020-10-31 10:17:59 +01:00
kudansul	3c4018faf0	Translate recipes_ko.yml via GitLocalize	2020-10-31 09:15:25 +00:00
20181241	aa29c33625	Translate recipes_ko.yml via GitLocalize	2020-10-31 09:15:24 +00:00
TheBusyBiscuit	f2200cee44	[CI skip] Merge pull request #2516 from svr333/RenameMessage ... Change not-valid to invalid	2020-10-31 10:08:48 +01:00
TheBusyBiscuit	5bf5d5a8c3	[CI skip] Merge pull request #2523 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x ... Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.13.1	2020-10-30 23:48:24 +01:00
Renovate Bot	3e795718f0	Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.13.1	2020-10-30 22:40:04 +00:00
TheBusyBiscuit	db673e0fb1	Forgotten a bracket 👀	2020-10-30 23:12:41 +01:00
TheBusyBiscuit	17e0d0ef1a	Update TalismanListener.java	2020-10-30 23:10:07 +01:00
TheBusyBiscuit	3471932050	Update Talisman.java	2020-10-30 23:05:55 +01:00
TheBusyBiscuit	e953eb1c81	Refactored talisman grabbing method	2020-10-30 23:03:44 +01:00
TheBusyBiscuit	6f39ef5b41	Fixed imports	2020-10-30 23:01:06 +01:00
TheBusyBiscuit	bae560bd5d	More formatting	2020-10-30 22:58:57 +01:00
TheBusyBiscuit	21d6281ecd	Some formatting	2020-10-30 22:57:27 +01:00
TheBusyBiscuit	192258fb74	Merge branch 'master' into MoreTalismans	2020-10-30 22:54:36 +01:00
TheBusyBiscuit	210c8d20f4	Fixes #2499	2020-10-30 22:50:16 +01:00
TheBusyBiscuit	95f827727d	[CI skip] Merge pull request #2520 from Slimefun/renovate/technote-space-toc-generator-2.x ... Update technote-space/toc-generator action to v2.6.1	2020-10-30 20:03:22 +01:00
TheBusyBiscuit	24e344e219	Fixed compatibility	2020-10-30 19:58:31 +01:00
TheBusyBiscuit	a3fb6c044b	Fixed logging	2020-10-30 19:54:34 +01:00
TheBusyBiscuit	08d1def90c	Fixed a small mistake	2020-10-30 19:50:05 +01:00
TheBusyBiscuit	f197e26a9c	Did not mean to make this final yet	2020-10-30 19:42:58 +01:00
TheBusyBiscuit	508b5aa198	Refactored AGenerator	2020-10-30 19:37:39 +01:00
TheBusyBiscuit	d6567e4bfa	Refactored AContainer	2020-10-30 19:31:22 +01:00
Renovate Bot	a54c978c2c	Update technote-space/toc-generator action to v2.6.1	2020-10-30 14:07:41 +00:00
Moritz Kempe	8324f5d830	Merge branch 'master' of https://github.com/Slimefun/Slimefun4 into master	2020-10-30 13:25:44 +01:00