1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 12:15:50 +00:00
Commit Graph

3007 Commits

Author SHA1 Message Date
poma123
c2fa590aa1
Requested changes 2020-08-07 22:43:58 +02:00
poma123
6ab196a03d
Requested changes 2020-08-07 22:04:15 +02:00
poma123
87f8e7ae8c
Fixed Industrial Miner debris issue 2020-08-07 21:46:59 +02:00
TheBusyBiscuit
9b21c1ade1
Merge pull request #2202 from dniym/elecPressSand
Elec press sand
2020-08-07 19:10:11 +02:00
dniym
1fde84a4c7 Approved Suggestion #272 - AutoBio#8746 2020-08-06 21:08:59 -04:00
TheBusyBiscuit
9de72881ab [CI skip] Fixed some URLs 2020-08-07 00:31:09 +02:00
TheBusyBiscuit
d55a546c42 Fixes #2168 2020-08-06 16:24:41 +02:00
Vravinite
b0c040ea7a Translate recipes_es.yml via GitLocalize 2020-08-06 07:47:06 +00:00
Luu7
4a45757a53 Translate messages_es.yml via GitLocalize 2020-08-06 07:47:03 +00:00
Luu7
33d802b940 Translate researches_es.yml via GitLocalize 2020-08-06 07:47:02 +00:00
TheBusyBiscuit
8d7d157503 Improved documentation 2020-08-06 00:54:49 +02:00
TheBusyBiscuit
ef01c85888 Some refactoring, requested changes 2020-08-06 00:30:33 +02:00
TheBusyBiscuit
dde0ab7de6
[CI skip] Merge pull request #2197 from TheBusyBiscuit/gitlocalize-12544
Updated hungarian translations
2020-08-05 23:39:44 +02:00
TheBusyBiscuit
94843c79c0
[CI skip] Merge pull request #2196 from TheBusyBiscuit/gitlocalize-12540
Update Japanese translation
2020-08-05 23:39:18 +02:00
TheBusyBiscuit
a032d151f1
[CI skip] Merge pull request #2195 from TheBusyBiscuit/gitlocalize-12539
Updated TR localization
2020-08-05 23:38:52 +02:00
TheBusyBiscuit
e758be8d3c
[CI skip] Merge pull request #2194 from TheBusyBiscuit/gitlocalize-12538
Tagalog/Filipino Translation Update
2020-08-05 23:38:28 +02:00
poma123
f89f3a35bb Translate messages_hu.yml via GitLocalize 2020-08-05 21:36:36 +00:00
András Marczinkó
9594046bd5 Translate recipes_hu.yml via GitLocalize 2020-08-05 21:36:35 +00:00
TheBusyBiscuit
c2cc7ab96c Translate messages_ja.yml via GitLocalize 2020-08-05 15:38:07 +00:00
LinoxGH
cd7a94516a Translate messages_tr.yml via GitLocalize 2020-08-05 15:06:58 +00:00
Scott Gomez Andoy
a0fe200948 Translate messages_tl.yml via GitLocalize 2020-08-05 14:54:16 +00:00
TheBusyBiscuit
3d8e01e6f2 Translate messages_de.yml via GitLocalize 2020-08-05 14:52:33 +00:00
TheBusyBiscuit
46a01c368f
Merge pull request #2192 from poma123/fix/brewing
Fixed prevent Slimefun items from being added to a Brewing Stand
2020-08-05 16:49:54 +02:00
TheBusyBiscuit
32849ca563
Merge branch 'master' into refactoring/block-energy 2020-08-05 16:45:34 +02:00
TheBusyBiscuit
7c3599c862 [CI skip] Reduced technical debt 2020-08-05 16:44:43 +02:00
TheBusyBiscuit
c168497e79 [CI skip] Reduced technical debt 2020-08-05 13:31:35 +02:00
poma123
9454c890ea Refactoring 2020-08-05 13:02:35 +02:00
poma123
6de4130d05 Fixed prevention when brewing with slimefun items 2020-08-05 12:41:48 +02:00
TheBusyBiscuit
f50d1d2faa Big performance improvements to Enhanced Furnaces when using Paper 2020-08-04 20:15:21 +02:00
TheBusyBiscuit
c56ebe9c23
Merge branch 'master' into IcePick 2020-08-04 19:12:00 +02:00
TheBusyBiscuit
18036aa181
Added a new entry to SlimefunItems.java 2020-08-04 19:07:00 +02:00
TheBusyBiscuit
f8a988261f
Fixed typo 2020-08-04 19:03:20 +02:00
TheBusyBiscuit
3adb634d8b
Make it not override the vanilla item anymore 2020-08-04 19:02:53 +02:00
TheBusyBiscuit
f9e9a7c491
Updated research id to not break compatibility 2020-08-04 19:00:38 +02:00
TheBusyBiscuit
06f64725d9 Improved performance for idling Enhanced Furnaces on Paper 2020-08-04 18:00:31 +02:00
TheBusyBiscuit
9719058bbc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 17:59:55 +02:00
TheBusyBiscuit
35684b60fc Optimized performance for rainbow blocks 2020-08-04 17:59:41 +02:00
TheBusyBiscuit
d80fdac23b Fixed debug fish 2020-08-04 15:49:58 +02:00
TheBusyBiscuit
b6ba6ce754 Updated all electric machines 2020-08-04 15:43:00 +02:00
Scott Gomez Andoy
927eefd63c Translate recipes_tl.yml via GitLocalize 2020-08-04 12:46:42 +00:00
TheBusyBiscuit
bc387ee47a Updated EnergyNet code 2020-08-04 13:50:22 +02:00
TheBusyBiscuit
368d2f5798 Move block energy code to EnergyNetComponent 2020-08-04 13:29:45 +02:00
TheBusyBiscuit
736b48a799
Merge pull request #2188 from TheBusyBiscuit/gitlocalize-12525
Added korean as a language
2020-08-04 12:54:45 +02:00
TheBusyBiscuit
14f0b0f3fe
[CI skip] Merge pull request #2186 from TheBusyBiscuit/gitlocalize-12523
Updated german translation
2020-08-04 12:54:20 +02:00
TheBusyBiscuit
8faf505999
Mark Korean as done 2020-08-04 12:50:48 +02:00
kwonms871
b41ef97859 Translate messages_ko.yml via GitLocalize 2020-08-04 10:48:38 +00:00
LinoxGH
bdde1d9745 Translate recipes_tr.yml via GitLocalize 2020-08-04 10:45:39 +00:00
TheBusyBiscuit
c2443a4df2 Translate recipes_de.yml via GitLocalize 2020-08-04 10:44:15 +00:00
TheBusyBiscuit
e870f82afd Added piglin bartering to translation files 2020-08-04 12:40:08 +02:00
TheBusyBiscuit
8a9dfe25a8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 12:30:30 +02:00
TheBusyBiscuit
dbed8b55d9
[CI skip] Merge pull request #2136 from dniym/PiglinDropsFgithub
Piglin drops fgithub
2020-08-04 12:25:26 +02:00
TheBusyBiscuit
0ff5fc7251 Small performance improvements for miner talismans 2020-08-04 10:19:24 +02:00
TheBusyBiscuit
eecdb61223 Fixed compilation 2020-08-04 09:53:50 +02:00
TheBusyBiscuit
04a71a2408 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-04 09:52:59 +02:00
TheBusyBiscuit
7cc795f30e One more change 2020-08-04 09:52:53 +02:00
TheBusyBiscuit
54aa45d1d2
Merge branch 'master' into cleanup/blockplacing 2020-08-04 09:47:51 +02:00
TheBusyBiscuit
484c7a22ec Fixes #2180 2020-08-04 09:46:35 +02:00
TheBusyBiscuit
f409b869ae Small performance optimization for bows 2020-08-04 09:46:04 +02:00
TheBusyBiscuit
137e91ad12
Fixes #2181 2020-08-04 01:16:20 +02:00
TheBusyBiscuit
8f289dcdbe Fixes #2181 2020-08-04 01:15:14 +02:00
TheBusyBiscuit
56b78eac61 Fixes #2183 2020-08-04 00:58:43 +02:00
TheBusyBiscuit
cafa66b1a8 Fixes #2184 2020-08-04 00:48:23 +02:00
TheBusyBiscuit
012a0a7df9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
2020-08-03 17:28:17 +02:00
TheBusyBiscuit
d8f5992282 Fixes #2103 2020-08-03 17:25:27 +02:00
TheBusyBiscuit
8d1e427409 A few more changes 2020-08-03 00:30:58 +02:00
dniym
17f84bcffd
Update PiglinBarterDrop.java
done
2020-08-02 17:44:57 -04:00
dniym
ecb3a354ff
Update PiglinBarterDrop.java
fixed
2020-08-02 17:44:11 -04:00
dniym
9287e1098d
Update PiglinListener.java
fixed
2020-08-02 17:43:26 -04:00
TheBusyBiscuit
1aeba31a96 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into cleanup/blockplacing

Conflicts:
	CHANGELOG.md
2020-08-02 23:15:05 +02:00
dniym
21305ddfdb
Update PiglinListener.java
fixed a compile error
2020-08-02 16:37:19 -04:00
dniym
9edc082230
Update PiglinBarterDrop.java 2020-08-02 16:29:08 -04:00
dniym
c2376b90b3
Update PiglinListener.java
made requested changes.
2020-08-02 16:25:39 -04:00
Lleyton Gray
43838d7270
Applying suggestion
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
2020-08-02 13:07:55 -07:00
TheBusyBiscuit
1389085932 Fixed Reinforced Spawners 2020-08-02 22:01:32 +02:00
Lleyton Gray
3703aaa993
Add ItemSetting for toggling mining of Ancient Debris.
Signed-off-by: Lleyton Gray <lleyton@innatical.com>
2020-08-02 12:52:16 -07:00
TheBusyBiscuit
d20650855c Fixes #2179 2020-08-02 21:45:58 +02:00
TheBusyBiscuit
b26f2a1ca8 Merge branch 'cleanup/blockplacing' of https://github.com/TheBusyBiscuit/Slimefun4 into cleanup/blockplacing 2020-08-02 21:37:03 +02:00
TheBusyBiscuit
a0b9579514 Added ToolUseHandler 2020-08-02 21:36:49 +02:00
lleyton
4c2b6bd1e7
Merge pull request #1 from TheBusyBiscuit/master
Sync Upstream with Fork
2020-08-02 12:18:47 -07:00
dniym
eed7b873c7
Update PiglinBarterDrop.java
made requested changes
2020-08-02 11:46:46 -04:00
dniym
8305729cfb
Update RandomMobDrop.java
made requested changes.
2020-08-02 11:45:19 -04:00
TheBusyBiscuit
6608c3c5d7
Merge branch 'master' into cleanup/blockplacing 2020-08-02 17:43:08 +02:00
TheBusyBiscuit
f32280a4ce Fixes #2176 2020-08-02 17:39:09 +02:00
TheBusyBiscuit
6573a60016 Another commit full of cleanup stuff 2020-08-02 15:16:21 +02:00
TheBusyBiscuit
23d730cd7a Some more refactoring 2020-08-02 14:04:24 +02:00
TheBusyBiscuit
bf65b310aa Fixes #2147 2020-08-02 13:55:58 +02:00
TheBusyBiscuit
34b82d7a6f Fixes #2164 2020-08-02 13:55:31 +02:00
kudansul
f3191658b8 Translate researches_ko.yml via GitLocalize 2020-08-02 11:46:07 +00:00
TheBusyBiscuit
e52d062ef5 Reduced technical debt and clutter 2020-08-02 11:22:00 +02:00
Lleyton Gray
fadb31feb1
Allow Ancient Debris to be mined by Industrial Miners 2020-08-01 20:47:43 -07:00
TheBusyBiscuit
0f924e485b
[CI skip] Merge pull request #2159 from TheBusyBiscuit/gitlocalize-12482
Categories_it
2020-08-01 16:58:41 +02:00
TheBusyBiscuit
c8c3edb66c
[CI skip] Merge pull request #2157 from TheBusyBiscuit/gitlocalize-12480
Researches_it
2020-08-01 16:58:26 +02:00
TheBusyBiscuit
a472097798 Fixed androids rotating to the wrong side 2020-08-01 16:16:15 +02:00
TheBusyBiscuit
72a3f59d4b Removed a deprecated method 2020-08-01 15:56:14 +02:00
TheBusyBiscuit
6580e82606 Removed deprecated things 2020-08-01 12:31:05 +02:00
TheBusyBiscuit
c510a8708c Performance improvements for androids 2020-08-01 12:25:47 +02:00
TheBusyBiscuit
76362b2acb Fixes #2166 2020-08-01 00:17:43 +02:00
TheBusyBiscuit
2fc18aed0a Fixes #2162 2020-07-31 20:24:58 +02:00
TheBusyBiscuit
e380f8b972 Fixes #2165 2020-07-31 20:18:51 +02:00
TheBusyBiscuit
446191d4bf Fixes #2156 2020-07-31 20:14:48 +02:00
prolletto64
bf3a0391d0 Translate categories_it.yml via GitLocalize 2020-07-31 13:43:17 +00:00
prolletto64
db424e0437 Translate researches_it.yml via GitLocalize 2020-07-31 13:41:59 +00:00
dniym
80ee551ca2 Made requested changes. 2020-07-30 20:14:14 -04:00
Scott Gomez Andoy
5d22bfb109 Translate recipes_tl.yml via GitLocalize 2020-07-30 23:59:34 +00:00
TheBusyBiscuit
df4f316675 Minor change 2020-07-31 01:39:10 +02:00
TheBusyBiscuit
90685edae6 Added a permission node for the debug fish 2020-07-31 01:32:43 +02:00
TheBusyBiscuit
dcb00dff20 [CI skip] Reduced technical debt 2020-07-31 01:08:23 +02:00
TheBusyBiscuit
2f05b9e4f8 Various fixes and performance improvements, mainly for talismans 2020-07-30 17:20:21 +02:00
SoSeDiK
8ddb055083 Translate researches_ru.yml via GitLocalize 2020-07-30 11:45:13 +00:00
SoSeDiK
2999e777f9 Translate messages_ru.yml via GitLocalize 2020-07-30 11:45:09 +00:00
TheBusyBiscuit
771456b6cd [CI skip] Fixed some malformed yaml 2020-07-30 13:30:20 +02:00
TheBusyBiscuit
a363cd1f5f
[CI skip] Removed trailing-spaces from config 2020-07-30 13:24:56 +02:00
TheBusyBiscuit
0412a2aec1 Fixes #2151 2020-07-30 10:23:44 +02:00
TheBusyBiscuit
ce18519808 Re-added conditional github warning messages 2020-07-29 23:21:41 +02:00
TheBusyBiscuit
ac4cfd3d68 Fixes #2145 2020-07-29 21:57:08 +02:00
TheBusyBiscuit
5a1b868c91 Fixed Metrics 2020-07-29 13:13:48 +02:00
TheBusyBiscuit
eb8e689d2c Fixes #2143 2020-07-29 13:03:52 +02:00
TheBusyBiscuit
8f2dc7cebc [Ci skip] Fixed formatting 2020-07-29 12:39:04 +02:00
TheBusyBiscuit
aba4019da0 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-29 12:37:33 +02:00
TheBusyBiscuit
2c3343ac5f [Ci skip] Fixed Metrics? 2020-07-29 12:37:16 +02:00
Nameless
08412f3c6c Translate researches_zh-CN.yml via GitLocalize 2020-07-28 01:16:18 +00:00
Nameless
641d24d48d Translate messages_zh-CN.yml via GitLocalize 2020-07-28 01:16:15 +00:00
TheBusyBiscuit
3573628621 Translate messages_hu.yml via GitLocalize 2020-07-26 23:00:23 +00:00
András Marczinkó
d01dadfa42 Translate researches_hu.yml via GitLocalize 2020-07-26 23:00:22 +00:00
dniym
4f5c1f6760 made requested changes 2020-07-26 12:06:06 -04:00
dniym
260a6f4f61 forgot one 2020-07-26 10:51:18 -04:00
dniym
65f8519805 made requested changes 2020-07-26 10:49:41 -04:00
dniym
ba8aafe312 made requested changes 2020-07-26 10:20:17 -04:00
TheBusyBiscuit
63569fac57 Reduced technical debt and refactored a bit 2020-07-26 13:03:33 +02:00
TheBusyBiscuit
8eb75ecbc8
Merge pull request #2134 from poma123/patch-2
Backwards-compatibility mode disabled on new servers
2020-07-26 12:23:22 +02:00
dniym
22a0623485 fixed formatting 2020-07-25 20:41:27 -04:00
dniym
9093e292a1 Rebased and re-commital of Piglin barter recipe addition. 2020-07-25 20:38:15 -04:00
bito-blosh
d1224b2d44 Translate resources_ja.yml via GitLocalize 2020-07-25 23:03:32 +00:00
bito-blosh
cb439b5aee Translate messages_ja.yml via GitLocalize 2020-07-25 23:03:31 +00:00
bito-blosh
9e317e8c4e Translate researches_ja.yml via GitLocalize 2020-07-25 23:03:30 +00:00
poma123
0d11d5ae89 Requested changes 2020-07-26 00:33:33 +02:00
poma123
b8d399a92c World-changing fix 2020-07-26 00:22:58 +02:00
poma123
ea2795d5b7 Implemented requested changes 2020-07-26 00:20:59 +02:00
poma123
e9650c1ca6
Revert the changed config 2020-07-25 23:58:18 +02:00
poma123
46998740fe
Update config.yml 2020-07-25 23:25:31 +02:00
TheBusyBiscuit
3ef6e2066a
Fixed a typo 2020-07-25 23:15:24 +02:00
TheBusyBiscuit
c717c0e4ce
[CI skip] Merge pull request #2130 from TheBusyBiscuit/gitlocalize-12447
Updated researches for chinese (Taiwan)
2020-07-25 15:39:47 +02:00
LinoxGH
8844ec17d7 Translate researches_tr.yml via GitLocalize 2020-07-25 13:36:45 +00:00
LinoxGH
8230987cfc Translate messages_tr.yml via GitLocalize 2020-07-25 13:36:44 +00:00
HeroBrineKing
191c4ffa60 Translate researches_zh-TW.yml via GitLocalize 2020-07-25 13:33:44 +00:00
TheBusyBiscuit
9435dfa2f2 Reduced technical debt and fixed a small issue 2020-07-25 15:29:45 +02:00
Scott Gomez Andoy
8792d8eace Translate researches_tl.yml via GitLocalize 2020-07-25 13:19:02 +00:00
Scott Gomez Andoy
9d1b307568 Translate messages_tl.yml via GitLocalize 2020-07-25 13:19:00 +00:00
MeerBiene
85d7cb0f69 Translate researches_de.yml via GitLocalize 2020-07-25 13:15:18 +00:00
TheBusyBiscuit
5b706ca6b3 Translate messages_de.yml via GitLocalize 2020-07-25 13:15:17 +00:00
TheBusyBiscuit
17cd55bf53
Merge pull request #2072 from TheBusyBiscuit/experimental
Merge of "experimental" branch
2020-07-25 15:07:47 +02:00
TheBusyBiscuit
447012efdf Don't consume zombie pills in creative 2020-07-25 15:02:51 +02:00
TheBusyBiscuit
dc854326ff Added sound effects to the Iron Golem Assembler 2020-07-25 14:59:53 +02:00
TheBusyBiscuit
e92e95c59e Fixed Enchantment Rune 2020-07-25 14:57:05 +02:00
TheBusyBiscuit
c3ab3a6ecc Fixed Enttiy Assemblers 2020-07-25 14:45:57 +02:00
TheBusyBiscuit
f15efd6cc2 Iron Golems require Carved Pumpkins 2020-07-25 14:42:29 +02:00
Scott Gomez Andoy
30e1a6ce0a Translate messages_tl.yml via GitLocalize 2020-07-25 12:41:27 +00:00
TheBusyBiscuit
107957a805 Fixed lore 2020-07-25 14:41:15 +02:00
TheBusyBiscuit
88604ee432 Fixed Iron Golem Assembler spawning Withers :o 2020-07-25 14:37:04 +02:00
TheBusyBiscuit
92ca696140 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
2020-07-25 14:27:12 +02:00
TheBusyBiscuit
20372f7e05
[CI skip] Merge pull request #2125 from TheBusyBiscuit/gitlocalize-12442
Updated Ukrainian localizations
2020-07-25 14:23:10 +02:00
TheBusyBiscuit
583a971c4f
[CI skip] Merge pull request #2124 from TheBusyBiscuit/gitlocalize-12441
Updated Russian localizations
2020-07-25 14:22:44 +02:00
TheBusyBiscuit
6374f09d29 Translate messages_de.yml via GitLocalize 2020-07-25 12:21:58 +00:00
TheBusyBiscuit
4b7e933410
[CI skip] Merge pull request #2123 from TheBusyBiscuit/gitlocalize-12440
Updated Turkish Translation
2020-07-25 14:19:52 +02:00
TheBusyBiscuit
42c57f8907 [CI skip] Small change 2020-07-25 14:19:09 +02:00
SoSeDiK
77f5224d14 Translate messages_uk.yml via GitLocalize 2020-07-25 12:05:24 +00:00
SoSeDiK
c6db53205c Translate messages_ru.yml via GitLocalize 2020-07-25 12:04:24 +00:00
LinoxGH
b68227b7b8 Translate messages_tr.yml via GitLocalize 2020-07-25 12:03:34 +00:00
TheBusyBiscuit
ebce279cf2
Merge pull request #2121 from poma123/patch-2 fixes #2097
Fixed piglin SlimefunItem pickup
2020-07-25 13:56:58 +02:00
poma123
dde3ec26ba Requested changes 2020-07-25 13:51:10 +02:00
poma123
a323b09e38 Fixed a tremendous mistake 2020-07-25 13:41:11 +02:00
poma123
5ff93b75e0 Added PiglinListener 2020-07-25 13:37:04 +02:00
poma123
a6d69ee9d6 Requested changes 2020-07-25 12:31:52 +02:00
TheBusyBiscuit
33f7c42e2c Added an option to disable the "Ignoring duplicate block" message 2020-07-25 12:28:04 +02:00
poma123
17a68ddcf5 Removed unnecessary Zombified Piglin check 2020-07-25 12:19:02 +02:00
poma123
9fb79c8622 Fixed piglin SlimefunItem pickup 2020-07-25 12:04:22 +02:00
TheBusyBiscuit
abc47af565 Fixed exception handling 2020-07-24 19:11:38 +02:00
LinoxGH
8481f0cde3
Merge branch 'experimental' into ShulkerShell 2020-07-24 19:42:12 +03:00
LinoxGH
3b17874ea2
Merge branch 'experimental' into IcePick 2020-07-24 19:39:59 +03:00
TheBusyBiscuit
499bbdbf70
Merge branch 'master' into experimental 2020-07-24 16:36:08 +02:00
András Marczinkó
6d74effbdf Translate resources_hu.yml via GitLocalize 2020-07-24 14:34:45 +00:00
András Marczinkó
3e5799391a Translate recipes_hu.yml via GitLocalize 2020-07-24 14:34:44 +00:00
András Marczinkó
b9fb1fe7bd Translate researches_hu.yml via GitLocalize 2020-07-24 14:34:42 +00:00
András Marczinkó
6cfc8b7bfc Translate categories_hu.yml via GitLocalize 2020-07-24 14:34:41 +00:00
TheBusyBiscuit
47be5f16ce [CI skip] Refactoring, also removed more deprecated things 2020-07-24 16:33:09 +02:00
TheBusyBiscuit
388300f25b
Merge pull request #2117 from kylehassall27/CrushCompressedCoal
Add recipes to crush compressed carbon into carbon and carbon into coal
2020-07-24 16:15:59 +02:00
TheBusyBiscuit
d69ef1effb
Merge pull request #2107 from WalshyDev/feature/metrics-module
Metrics!
2020-07-24 16:06:53 +02:00
KykyRocks1
dca5348aae Added recipes to crush compressed carbon into carbon and carbon into coal 2020-07-23 15:56:44 -04:00
TheBusyBiscuit
1f7b75b823 Added Iron Golem Assembler (experimental) 2020-07-23 12:02:53 +02:00
Daniel Walsh
b13776d729 Final changes 2020-07-23 10:37:23 +01:00
Daniel Walsh
6f92bd6c28 Requested changes 2020-07-23 09:51:35 +01:00
TheBusyBiscuit
ee62a9b004 Optimized Enhanced Furnaces for Paper and fixes #1894 2020-07-23 01:23:03 +02:00
TheBusyBiscuit
916fb554d0 Fixes #2086 2020-07-23 00:52:59 +02:00
Daniel Walsh
d547d61151 Requested changes 2020-07-22 20:45:55 +01:00
TheBusyBiscuit
ba4282c3e7
[CI skip] Merge pull request #2109 from WalshyDev/change/some-small-changes
Fix some regex, finals and replace isPresent with ifPresent
2020-07-22 21:23:20 +02:00
TheBusyBiscuit
8c867c09b6 [CI skip] Some documentation 2020-07-22 21:17:25 +02:00
TheBusyBiscuit
31e4cfa29b
Merge branch 'master' into feature/metrics-module 2020-07-22 20:43:39 +02:00
Daniel Walsh
5e3eccfaa4 Fix some regex, finals and replace isPresent with ifPresent 2020-07-22 18:06:42 +01:00
TheBusyBiscuit
d2754f06fc [CI skip] A bit refactoring 2020-07-22 18:11:43 +02:00
Daniel Walsh
2646eba615 Small change 2020-07-21 14:51:04 +01:00
Daniel Walsh
52a3cbae41 Merge master 2020-07-21 13:57:40 +01:00
Poma123
5fa4e8b083
Added BONE_BLOCK to GrindStone 2020-07-21 13:51:08 +02:00
TheBusyBiscuit
f1e650b28c
Merge branch 'master' into experimental 2020-07-21 10:18:34 +02:00
TheBusyBiscuit
6eebb79314 Fixed 2020-07-21 09:56:29 +02:00
Daniel Walsh
58dbbd8944 Better handling of downloaded files, typo fix and small changes 2020-07-21 08:47:36 +01:00
Daniel Walsh
d31a293486 Requested changes 2020-07-20 16:04:49 +01:00
Daniel Walsh
d252e5a2b5 final final final small thing 2020-07-20 15:51:32 +01:00
Daniel Walsh
4d61a7db51 Reshade stupid bStats 2020-07-20 15:47:22 +01:00
Daniel Walsh
8da64ab308 Moved the metric class 2020-07-20 15:35:31 +01:00
Daniel Walsh
50f034b3e3 Documentation 2020-07-20 15:31:32 +01:00
TheBusyBiscuit
29b26ed327 Made requested changes 2020-07-20 16:30:20 +02:00
Daniel Walsh
fb40bffdce Small change 2020-07-20 15:17:24 +01:00
Daniel Walsh
55041e81b1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into feature/metrics-module 2020-07-20 15:15:39 +01:00
Daniel Walsh
67db0ce59e Oh baby, this is a big one 2020-07-20 15:15:21 +01:00
TheBusyBiscuit
397f194029 Fixed two synchronization issues 2020-07-20 13:08:13 +02:00
TheBusyBiscuit
fd10f2ea4c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into paper 2020-07-20 12:48:25 +02:00
TheBusyBiscuit
eb9466c41d Added a research for the Tape Measure (experimental) 2020-07-20 12:47:13 +02:00
TheBusyBiscuit
4e0df92b56 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
2020-07-20 12:46:12 +02:00
TheBusyBiscuit
613bcd86b8 Fixes #2093 2020-07-20 12:43:05 +02:00
TheBusyBiscuit
f4c0c9f905 Minor changes 2020-07-20 10:49:59 +02:00
TheBusyBiscuit
64b59e3a02 Spigot is now called "Spigot" 2020-07-20 03:05:49 +02:00
TheBusyBiscuit
c1d6021216 Optimized teleportations 2020-07-20 02:31:58 +02:00
TheBusyBiscuit
045cdf1090 Added performance improvements for Block States 2020-07-20 02:22:24 +02:00
TheBusyBiscuit
ae780a69bb Added PaperLib 2020-07-20 01:51:14 +02:00
TheBusyBiscuit
14e062810b Fixes #2075 2020-07-19 10:53:09 +02:00
TheBusyBiscuit
8042deb591 Some small improvements 2020-07-19 10:31:12 +02:00
TheBusyBiscuit
c78e3c3959 Performance improvements for cargo (when ChestTerminals is installed) 2020-07-16 22:41:36 +02:00
Daniel Walsh
b59c53c2e6 Fix long outstanding prefix bug 2020-07-16 19:55:16 +01:00
TheBusyBiscuit
75ca7f1d4b Cargo performance improvement 2020-07-15 23:49:44 +02:00
TheBusyBiscuit
52efb03305 Relocated a class 2020-07-15 19:52:29 +02:00
TheBusyBiscuit
3455c70d58 More refactoring 2020-07-15 19:19:38 +02:00
TheBusyBiscuit
52dd7e9705 Refactoring 2020-07-15 18:50:26 +02:00
TheBusyBiscuit
d26eed4534 Removed redundant check 2020-07-15 18:46:17 +02:00
TheBusyBiscuit
72e1cc33bb Minor change 2020-07-15 18:23:57 +02:00
TheBusyBiscuit
eaaf0c5c01 Another performance improvement to Energy networks 2020-07-15 18:23:21 +02:00
TheBusyBiscuit
f14ec8dc99 Missed one line 2020-07-15 13:20:47 +02:00
TheBusyBiscuit
45c01df9dc Updated to latest Spigot API methods 2020-07-15 13:19:51 +02:00
TheBusyBiscuit
c574337318 Reworked Energy Providers (Generators) 2020-07-15 13:17:27 +02:00
TheBusyBiscuit
0735eaad83 [CI skip] Removed more deprecated code 2020-07-14 13:19:04 +02:00
TheBusyBiscuit
572d3dceec
Merge branch 'experimental' into ShulkerShell 2020-07-13 17:05:39 +02:00
TheBusyBiscuit
50c579b7d6 Added a Tape Measure to the experimental branch 2020-07-13 11:55:59 +02:00
TheBusyBiscuit
f5db4bf695 Merge branch 'master' 2020-07-13 10:42:47 +02:00
TheBusyBiscuit
5c159b4247 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	CHANGELOG.md
	src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
2020-07-13 10:41:53 +02:00
TheBusyBiscuit
0f7318a749 [CI skip] Removed deprecated classes 2020-07-13 10:36:16 +02:00
koloksk
28b44f8dd8 Translate categories_pl.yml via GitLocalize 2020-07-13 08:32:18 +00:00
Wirusiu
8c1c72cafd Translate messages_pl.yml via GitLocalize 2020-07-13 08:32:17 +00:00
Wirusiu
5ccf0faedf Translate researches_pl.yml via GitLocalize 2020-07-13 08:32:12 +00:00
Nathan Adhitya
a342aaa1cc Translate categories_id.yml via GitLocalize 2020-07-13 08:16:08 +00:00
Scott Gomez Andoy
8dbb2cf2fb Translate researches_tl.yml via GitLocalize 2020-07-12 14:09:00 +00:00
TheBusyBiscuit
9af908300f Fixed a NullPointerException for Error-Reports for generators 2020-07-12 13:19:16 +02:00
TheBusyBiscuit
058f34879a Moved the Soulbound Backpack to "Magical Gadgets" 2020-07-10 18:02:51 +02:00
TheBusyBiscuit
8fd0afd8bd Fixes #2081 2020-07-09 18:35:48 +02:00
TheBusyBiscuit
6d3e4ca96b Added a missing annotation 2020-07-09 13:59:16 +02:00
TheBusyBiscuit
4dcc73bbf8 Fixed javadocs 2020-07-09 13:58:04 +02:00
TheBusyBiscuit
c9c760836e Another class relocation 2020-07-09 12:43:26 +02:00
TheBusyBiscuit
c2b0121a07 More refactoring 2020-07-08 13:32:19 +02:00
TheBusyBiscuit
c516cab263 Some refactoring and small optimizations 2020-07-08 11:26:44 +02:00
TheBusyBiscuit
0984afb3c6 Post-PR refactoring 2020-07-07 10:54:32 +02:00
TheBusyBiscuit
f304406aa8
[CI skip] Merge pull request #2071 from dniym/ChanceDrop
Added Chance Drop for MOB_DROP recipe items. References #980
2020-07-07 10:28:51 +02:00
dniym
367dd8c914 Negated isDroppedFromGolems 2020-07-06 22:28:41 -04:00
dniym
371b283d21 Replaced Tabs with Spaces as requested 2020-07-06 19:19:13 -04:00
TheBusyBiscuit
5e54cd9ec5 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-06 22:04:45 +02:00
TheBusyBiscuit
afd63a1f51 Small performance optimization for large Cargo networks 2020-07-06 22:04:32 +02:00
LinoxGH
ca2c068e7a
Merge branch 'experimental' into IcePick 2020-07-06 20:13:18 +03:00
dniym
43b48b4b3d Made Requested Changes 2020-07-05 16:54:27 -04:00
dniym
96b4394d7f Made requested changes 2020-07-05 16:45:08 -04:00
bito-blosh
0c0e45a34b Translate recipes_ja.yml via GitLocalize 2020-07-05 16:46:45 +00:00
dniym
b3f801d84e Made requested changes 2020-07-05 12:35:40 -04:00
TheBusyBiscuit
613dc7b328
Merge branch 'master' into experimental 2020-07-05 16:54:06 +02:00
dniym
645d73d0ef Made requested changes. 2020-07-05 10:40:07 -04:00
TheBusyBiscuit
b243f128de Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-05 15:07:32 +02:00
TheBusyBiscuit
098304a1c4 Implemented a texture cache for contributors 2020-07-05 15:07:28 +02:00
TheBusyBiscuit
3408fcf11f Updated assets 2020-07-05 14:39:28 +02:00
EnderWingZ
ceb8af5e58 Translate messages_id.yml via GitLocalize 2020-07-05 12:36:19 +00:00
Frozenkamui
fe6f61cce2 Translate researches_id.yml via GitLocalize 2020-07-05 12:36:11 +00:00
TheBusyBiscuit
e3a920826d One more change 2020-07-05 13:30:13 +02:00
TheBusyBiscuit
6a950fe8d6 Fixed lore 2020-07-05 13:06:13 +02:00
TheBusyBiscuit
b01254eb9d Added Reinforced Cloth 2020-07-05 13:01:17 +02:00
TheBusyBiscuit
74cf035709 Fixed a NullPointerException 2020-07-05 12:13:03 +02:00
TheBusyBiscuit
9426ebb2e9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into experimental

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java
2020-07-05 12:08:30 +02:00
TheBusyBiscuit
88dfdfa560 Small improvement to Cargo performance 2020-07-05 12:04:40 +02:00
TheBusyBiscuit
4edc557547 Fixed an issue where moving Androids got stuck 2020-07-05 11:46:20 +02:00
TheBusyBiscuit
7d901744fd Small improvement 2020-07-04 19:15:13 +02:00
TheBusyBiscuit
5a19b18633 Thunderstorms now count as night for Solar Generators (+ other stuff) 2020-07-04 19:04:29 +02:00
dniym
27149ee514 Fixed formatting error 2020-07-04 09:42:17 -04:00
dniym
aca5b6efc5 Removed unused import 2020-07-04 09:39:13 -04:00
dniym
f80bada54b Made Requested Changes 2020-07-04 09:36:29 -04:00
dniym
1ddd763dbf Added Chance Drop for MOB_DROP recipe items. References #980
Added interface for ChanceDrop items

Added a check for chance drop items in the EntityDeathListener

Adjusted circuit board to have a 75% chance rather than 100% chance
2020-07-03 23:19:19 -04:00
TheBusyBiscuit
768e4f1021 Massive performance improvements to Rainbow Glass Panes 2020-07-03 17:43:10 +02:00
TheBusyBiscuit
06b14836dd Added plugins summary to /sf timings 2020-07-03 14:47:51 +02:00
LinoxGH
bbcf1da3e2 Translate recipes_tr.yml via GitLocalize 2020-07-02 20:47:59 +00:00
TheBusyBiscuit
4ddea8f7ae Small performance improvement 2020-07-02 20:41:40 +02:00
TheBusyBiscuit
b2f594ed88
Merge pull request #2064 from TheBusyBiscuit/feature/profiler
Changes to performance, added a proper Lag Profiler
2020-07-02 18:11:04 +02:00
TheBusyBiscuit
172a2c47fb Added a directional cache to Cargo Nodes, should improve performance 2020-07-02 18:04:26 +02:00
Scott Gomez Andoy
424cf12b64 Translate messages_tl.yml via GitLocalize 2020-07-02 11:27:02 +00:00
Scott Gomez Andoy
144483178d Translate categories_tl.yml via GitLocalize 2020-07-02 11:27:01 +00:00
TheBusyBiscuit
8cbaf14d2e Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into feature/profiler

Conflicts:
	CHANGELOG.md
2020-07-02 11:51:38 +02:00
TheBusyBiscuit
cfefa393a6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-07-02 11:50:25 +02:00
TheBusyBiscuit
548e3586ae Fixes #2066 2020-07-02 11:50:07 +02:00
TheBusyBiscuit
697b173359 Refactoring 2020-07-02 11:26:38 +02:00
TheBusyBiscuit
ef7624dde9 Performance improvement for ChestTerminal 2020-07-01 20:39:01 +02:00
TheBusyBiscuit
1016b5fc76 Added better summaries, ratings + more performance improvements 2020-07-01 18:20:34 +02:00
LinoxGH
0e9c1a6ccf Removed a redundant import. 2020-07-01 10:33:25 +03:00
LinoxGH
7bf31d600e Did the requested change. 2020-07-01 10:31:06 +03:00
LinoxGH
9100dfe6f3 Minor refactoring and more documentation. 2020-06-30 23:38:21 +03:00
TheBusyBiscuit
a4197fe5dd A couple of performance and memory optimizations 2020-06-30 21:31:55 +02:00
TheBusyBiscuit
d82b66a842 Added a better profiler 2020-06-30 19:36:55 +02:00
TheBusyBiscuit
0aa99df8c2 Performance optimization 2020-06-30 16:44:50 +02:00
LinoxGH
12176a9ae7
Merge branch 'experimental' into IcePick 2020-06-30 13:09:02 +03:00
TheBusyBiscuit
527ffdd742 Added Gilded Blackstone recipe to the Ore Crusher 2020-06-30 02:12:40 +02:00
TheBusyBiscuit
cb7cc4402f Refactoring 2020-06-30 01:33:13 +02:00
TheBusyBiscuit
30c87b2256
Merge pull request #2046 from LinoxGH/EnchRune
Enchantment Rune
2020-06-30 01:23:20 +02:00
TheBusyBiscuit
6f1a2b82b5 Added runtime deprecation warnings for Addon Creators 2020-06-29 17:12:54 +02:00
TheBusyBiscuit
3415a124c7 A bunch of refactoring 2020-06-29 15:47:51 +02:00
TheBusyBiscuit
3713940512 Prevent Spigot from breaking everything... 2020-06-29 15:19:20 +02:00
LinoxGH
b6112e2728
Did a requested change. 2020-06-29 14:45:27 +03:00
TheBusyBiscuit
fe63637281 Removed unused folder 2020-06-29 13:04:36 +02:00
TheBusyBiscuit
4f2bb90f15 [CI skip] Slight refactoring 2020-06-29 12:10:45 +02:00
TheBusyBiscuit
acd8278889
Merge pull request #2045 from LinoxGH/ExplosiveBowChange
Explosive Bow Area of Effect
2020-06-29 11:46:44 +02:00
LinoxGH
942bf436bb Did another requested change. 2020-06-29 10:02:54 +03:00
TheBusyBiscuit
7f7ed6861e Fixes #1959 and other Grappling hook-related issues 2020-06-29 03:04:31 +02:00
LinoxGH
833b2d3943 Did another requested change. 2020-06-29 01:11:01 +03:00
LinoxGH
28b5d545da Did some requested change. 2020-06-29 00:56:38 +03:00
LinoxGH
5c7accbbe8 Did the requested changes + a fix. 2020-06-28 23:46:09 +03:00
LinoxGH
27ba744fe5 Fixed a little bug. 2020-06-28 22:09:04 +03:00
LinoxGH
e55e2690e7 Did the requested changes. 2020-06-28 22:06:35 +03:00
LinoxGH
005d4c04cc Did the requested changes. 2020-06-28 18:53:12 +03:00
TheBusyBiscuit
c63f4bf8af
Merge pull request #2057 from LinoxGH/HazmatSuitBees
Added Bee Protection to Hazmat Suit.
2020-06-28 17:12:10 +02:00
LinoxGH
ef1735985e Did the requested changes, enabled and fixed JUnit test. 2020-06-28 16:42:46 +03:00
LinoxGH
64debe70de Fixed the build errors. 2020-06-28 14:49:20 +03:00
LinoxGH
073fe1322b Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into IcePick
 Conflicts:
	src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java
2020-06-28 14:42:34 +03:00
LinoxGH
911ee2340f Did a requested change. 2020-06-28 14:22:15 +03:00
TheBusyBiscuit
03c08ed6f1 Fixes #2062 2020-06-28 11:20:56 +02:00
LinoxGH
d7ba054bef Removed unused imports. 2020-06-28 05:39:32 +03:00
LinoxGH
f3d21daf6a Did the requested changes. 2020-06-28 05:38:49 +03:00
LinoxGH
3e271ac786 Did more requested changes. 2020-06-28 05:29:51 +03:00
LinoxGH
a935951c22 Oops forgot to change these. 2020-06-28 01:14:37 +03:00
LinoxGH
07d837299f Did the requested changes. 2020-06-28 01:07:37 +03:00
LinoxGH
2ecf5a8845 Performance Improvement. 2020-06-28 00:33:17 +03:00
LinoxGH
558d069a33 Did the requested changes + improvements. 2020-06-27 17:45:39 +03:00
LinoxGH
64a1b247b4 Did the requested changes + fixes. 2020-06-27 17:30:28 +03:00
LinoxGH
a456034005 Fixed merge conflicts. 2020-06-27 16:07:22 +03:00
LinoxGH
ba0c3b30dd Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees
 Conflicts:
	src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
2020-06-27 16:01:36 +03:00
LinoxGH
b5ef8ff019 Did the requested changes + improvements. 2020-06-27 15:58:36 +03:00
TheBusyBiscuit
4314581a61 Another fix and an addition 2020-06-27 14:22:45 +02:00
TheBusyBiscuit
50aaa4b965 Added a few more items to the Bio Generator 2020-06-27 14:04:31 +02:00
TheBusyBiscuit
3dc043c857 Refactoring: Relocated Plugin class 2020-06-27 13:10:47 +02:00
LinoxGH
73973a00b7 Did the requested changes and some fixes. 2020-06-27 12:26:15 +03:00
LinoxGH
52dc7585fc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/tasks/ArmorTask.java
2020-06-27 08:09:09 +03:00
TheBusyBiscuit
ca36271a79
Merge pull request #2055 from TheBusyBiscuit/refactoring/item-energy
Lots of refactoring and rewriting of Item Energy
2020-06-27 03:43:55 +02:00
TheBusyBiscuit
6d36655081 Another optimization for Solar Generators 2020-06-27 03:40:27 +02:00
TheBusyBiscuit
bd2f4b196d Minor optimization for Solar Helmet checks 2020-06-27 03:29:10 +02:00
TheBusyBiscuit
468617d9a2 Changed a comment. 2020-06-27 03:13:43 +02:00
TheBusyBiscuit
44c0029587 Fixed a rare concurrency issue with world saving 2020-06-27 02:47:53 +02:00
TheBusyBiscuit
0dfd40e407 Fixed a few more color codes for 1.16 (Sorry Walshy :P ) 2020-06-27 02:35:29 +02:00
TheBusyBiscuit
f6f09d2e2e Some more refactoring 2020-06-27 02:28:01 +02:00
TheBusyBiscuit
b2833b3ce8 Removed unused parameter 2020-06-27 02:18:49 +02:00
TheBusyBiscuit
e081d15c6d Fixed a slight mistake with the lore 2020-06-27 01:46:20 +02:00
LinoxGH
bc074c83ee Did the requested changes. 2020-06-27 02:22:17 +03:00
LinoxGH
ffd57ec760 Did the requested Changes 2020-06-27 01:51:38 +03:00
Vravinite
c941b9080f Translate recipes_es.yml via GitLocalize 2020-06-26 21:53:21 +00:00
HeroBrineKing
758e687783 Translate messages_zh-TW.yml via GitLocalize 2020-06-26 21:51:20 +00:00
HeroBrineKing
3ba284746b Translate researches_zh-TW.yml via GitLocalize 2020-06-26 21:51:18 +00:00
HeroBrineKing
6b89cd3fc2 Translate recipes_zh-TW.yml via GitLocalize 2020-06-26 21:51:17 +00:00
HeroBrineKing
dab48cbe13 Translate categories_zh-TW.yml via GitLocalize 2020-06-26 21:51:16 +00:00
LinoxGH
9fcbe94553 Organized the new imports. 2020-06-27 00:13:00 +03:00
LinoxGH
6334e251cb Improved the computation of velocity. 2020-06-27 00:06:22 +03:00
LinoxGH
f1aa8a08d0 Did the requested changes 2020-06-26 23:59:40 +03:00
LinoxGH
29fe881768 Added a new lore to Hazmat Suit for 1.15+ 2020-06-26 23:31:15 +03:00
LinoxGH
cd4a36c519 Added Bee Protection to Hazmat Suit. 2020-06-26 23:18:27 +03:00
LinoxGH
207cb35dda Added Climbing Pick 2020-06-26 22:03:17 +03:00
TheBusyBiscuit
80fc0a173e Added lore addition 2020-06-26 20:58:23 +02:00
TheBusyBiscuit
ed85a9a051 Added Unit tests for rechargeable items 2020-06-26 17:58:54 +02:00
TheBusyBiscuit
28e5b57c5d Some better exception handling 2020-06-26 17:36:57 +02:00
TheBusyBiscuit
8d0c816ed2 Some performance improvements 2020-06-26 16:27:16 +02:00
TheBusyBiscuit
6ffa5ab9a7 Lots of refactoring and rewriting of Item Energy 2020-06-26 15:32:57 +02:00
LinoxGH
eb2bbae0c9 Did the requested changes. 2020-06-26 13:31:45 +03:00
LinoxGH
9176d795c8 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into EnchRune 2020-06-26 13:28:45 +03:00
SoSeDiK
6ab2b34a83 Translate researches_uk.yml via GitLocalize 2020-06-26 08:53:56 +00:00
SoSeDiK
ca73b4a891 Translate recipes_uk.yml via GitLocalize 2020-06-26 08:53:54 +00:00
SoSeDiK
1e6ac71bef Translate messages_uk.yml via GitLocalize 2020-06-26 08:53:53 +00:00
TheBusyBiscuit
05740b4459
[CI skip] Merge pull request #2051 from TheBusyBiscuit/gitlocalize-12226
Updated Russian messages
2020-06-26 10:43:43 +02:00
TheBusyBiscuit
2b1acfd121
[CI skip] Merge pull request #2052 from TheBusyBiscuit/gitlocalize-12227
Updated Russian researches
2020-06-26 10:41:29 +02:00
SoSeDiK
5d283c053d Translate recipes_ru.yml via GitLocalize 2020-06-26 08:38:51 +00:00
SoSeDiK
1b159091a0 Translate researches_ru.yml via GitLocalize 2020-06-26 08:38:41 +00:00
SoSeDiK
e358289c4b Translate messages_ru.yml via GitLocalize 2020-06-26 08:38:32 +00:00
TheBusyBiscuit
df8ae5738d
[CI skip] Merge pull request #2050 from TheBusyBiscuit/gitlocalize-12224
Update recipes_zh-CN.yml
2020-06-26 10:34:58 +02:00
Nameless
682dcf1189 Translate recipes_zh-CN.yml via GitLocalize 2020-06-26 04:57:58 +00:00
Scott Gomez Andoy
526c2e5228 Translate recipes_tl.yml via GitLocalize 2020-06-25 23:36:17 +00:00
TheBusyBiscuit
1520e71107
Updated translators 2020-06-25 22:51:56 +02:00
krazybeat
2cc97398d0 Translate researches_pt-BR.yml via GitLocalize 2020-06-25 20:50:17 +00:00
FaolanMalcadh
514e6af7a6 Translate categories_pt-BR.yml via GitLocalize 2020-06-25 20:50:16 +00:00
LinoxGH
f54b277111 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into EnchRune
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/resources/languages/researches_en.yml
2020-06-25 22:35:14 +03:00
LinoxGH
1a8ff9c511 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ExplosiveBowChange 2020-06-25 22:16:49 +03:00
LinoxGH
e016ea1180 Explosive Bow Functionality Changed.
Explosive Bow now deals an area of effect.
2020-06-25 22:13:24 +03:00
TheBusyBiscuit
d18af0c211 Ore Crusher now also accepts Nether Gold Ore 2020-06-25 15:27:18 +02:00
TheBusyBiscuit
e66aa0baa5 Added Smithing Table Recipe support 2020-06-25 15:18:31 +02:00
TheBusyBiscuit
427a312240 More steps towards 1.16 compatibility (unfinished) 2020-06-25 14:43:17 +02:00
TheBusyBiscuit
92e7e58915
Merge branch 'master' into support/1.16 2020-06-25 13:40:28 +02:00
TheBusyBiscuit
3b7ad0ac63
[CI skip] Merge pull request #2039 from LinoxGH/AutoDrierFix
Auto Drier 1.13 Update
2020-06-25 13:27:50 +02:00
LinoxGH
f9c8cd1d76 Fixed the recipe. 2020-06-25 14:08:57 +03:00
LinoxGH
82b9de4c54 Fixed merge conflict. 2020-06-25 13:38:30 +03:00
LinoxGH
7e20e7cd9f Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into AutoDrierFix
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunItems.java
2020-06-25 13:37:33 +03:00
TheBusyBiscuit
ff205aee4e
Merge pull request #2027 from SoSeDiK/storage
Improve the handling of non-registered worlds
2020-06-25 12:12:08 +02:00
SoSeDiK
e52ac9d43b Make it compile 2020-06-25 13:06:34 +03:00
SoSeDiK
386cbea53b Whoops 2020-06-25 12:59:02 +03:00
SoSeDiK
ade18c7bd8 Remove unused import 2020-06-25 12:58:04 +03:00
SoSeDiK
4ed2258eb0 Replace stream with for loop 2020-06-25 12:49:18 +03:00
TheBusyBiscuit
3402f344b2
[CI skip] Merge pull request #2034 from TheBusyBiscuit/gitlocalize-12215
Turkish Translation Update Pt.4
2020-06-25 10:33:54 +02:00
TheBusyBiscuit
8e8dd55994
[CI skip] Merge pull request #2033 from TheBusyBiscuit/gitlocalize-12214
Turkish Translation Update Pt.3
2020-06-25 10:33:32 +02:00
TheBusyBiscuit
bfc1fac276
[CI skip] Merge pull request #2032 from TheBusyBiscuit/gitlocalize-12213
Turkish Translation Update Pt.2
2020-06-25 10:33:06 +02:00
TheBusyBiscuit
c1bce66bca
[CI skip] Merge pull request #2031 from TheBusyBiscuit/gitlocalize-12212
Turkish Translation Update Pt.1
2020-06-25 10:32:28 +02:00
TheBusyBiscuit
dab7baceaa
[CI skip] Merge pull request #2028 from TheBusyBiscuit/gitlocalize-12211
Filipino/Tagalog Translation Update
2020-06-25 10:31:53 +02:00
TheBusyBiscuit
75cfc05cdb
[CI skip] Merge pull request #2026 from TheBusyBiscuit/gitlocalize-12210
Update chinese translation to latest
2020-06-25 10:29:33 +02:00
TheBusyBiscuit
3aa4930e9f
[CI skip] Merge pull request #2025 from TheBusyBiscuit/gitlocalize-12207
researches_es
2020-06-25 10:28:43 +02:00
LinoxGH
7a09253311 Merge branch 'master' of https://github.com/LinoxGH/Slimefun4 into ShulkerShell
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/ResearchSetup.java
	src/main/resources/languages/researches_en.yml
2020-06-25 10:11:33 +03:00
LinoxGH
898294c4a2 Translate researches_tr.yml via GitLocalize 2020-06-25 06:08:57 +00:00
LinoxGH
7d250e58d6 Translate recipes_tr.yml via GitLocalize 2020-06-25 06:08:18 +00:00
LinoxGH
2cd81a2dbc Translate messages_tr.yml via GitLocalize 2020-06-25 06:07:35 +00:00
LinoxGH
8ec118f88c Translate categories_tr.yml via GitLocalize 2020-06-25 06:07:06 +00:00
Scott Gomez Andoy
d76e2fb752 Translate researches_tl.yml via GitLocalize 2020-06-25 05:57:06 +00:00
Scott Gomez Andoy
3ee151b069 Translate messages_tl.yml via GitLocalize 2020-06-25 05:51:05 +00:00
Daniel Walsh
81e16a6c47 1.16 support 2020-06-25 06:05:17 +01:00
Scott Gomez Andoy
ea9b2e2494 Translate researches_tl.yml via GitLocalize 2020-06-25 04:45:20 +00:00
Scott Gomez Andoy
00a61a296f Translate messages_tl.yml via GitLocalize 2020-06-25 04:45:19 +00:00
SoSeDiK
ecd97b3e50 Fixed a tiny typo 2020-06-25 05:54:21 +03:00
Nameless
9ade467249 Translate researches_zh-CN.yml via GitLocalize 2020-06-25 02:41:27 +00:00
Nameless
bb3650e9e7 Translate messages_zh-CN.yml via GitLocalize 2020-06-25 02:41:25 +00:00
SoSeDiK
c175596536 Improve the handling of non-registered worlds 2020-06-25 05:33:02 +03:00
Vravinite
813e72b5b4 Translate researches_es.yml via GitLocalize 2020-06-25 02:10:20 +00:00
Luu7
6276029aec Translate messages_es.yml via GitLocalize 2020-06-25 01:46:53 +00:00
TheBusyBiscuit
655fb44021
[CI skip] Merge pull request #2022 from TheBusyBiscuit/gitlocalize-12200
Translate added section in messages into Japanese.
2020-06-25 02:35:25 +02:00
TheBusyBiscuit
d3a30347fd
[CI skip] Merge pull request #2021 from TheBusyBiscuit/gitlocalize-12199
Translate added section in categories into Japanese.
2020-06-25 02:34:46 +02:00
bito-blosh
5d4bc5c769 Translate researches_ja.yml via GitLocalize 2020-06-25 00:21:47 +00:00
TheBusyBiscuit
1d43faeb76 Translate messages_ja.yml via GitLocalize 2020-06-25 00:13:08 +00:00
bito-blosh
89357ba7db Translate categories_ja.yml via GitLocalize 2020-06-25 00:13:06 +00:00
TheBusyBiscuit
a36c42959e Some refactoring of PR #2020 2020-06-25 00:21:43 +02:00
LinoxGH
3cba1f71fc Fixed an issue created by another pr. 2020-06-24 22:46:02 +03:00
LinoxGH
8f0c5100d4
Merge branch 'master' into AutoBrewer 2020-06-24 22:38:15 +03:00
LinoxGH
4249a2b85b Did the requested changes. 2020-06-24 22:33:55 +03:00
TheBusyBiscuit
c64b311ee2 Finished merge of PR #2015 and updated language keys 2020-06-24 21:25:21 +02:00
LinoxGH
776dc2a302 Added some documentation. 2020-06-24 22:17:01 +03:00
TheBusyBiscuit
cccc8f2162
[CI skip] Merge pull request #2015 from LinoxGH/master
Added Magic Pills. The Edited Version
2020-06-24 21:11:30 +02:00
TheBusyBiscuit
2424a2ceab [CI skip] Refactoring 2020-06-24 20:50:53 +02:00
LinoxGH
4832701fda Added a research for the recipe. 2020-06-24 21:41:35 +03:00
LinoxGH
9096db6137 Added a new recipe for shulker shell. 2020-06-24 21:39:03 +03:00
LinoxGH
841b2003bb Added 1.13 compability for auto drier. 2020-06-24 21:33:22 +03:00
LinoxGH
e1fc23c265 Fixed an import dis-organisation. 2020-06-24 21:27:27 +03:00
LinoxGH
daadabd535 Fixed an import dis-organisation. 2020-06-24 21:25:42 +03:00
LinoxGH
4f6bbafdfc Added Auto Brewer.
A new medium machine that can create potions automatically.
2020-06-24 21:24:16 +03:00
TheBusyBiscuit
58ccc4b87a Added Tagalog 2020-06-24 20:18:55 +02:00
TheBusyBiscuit
db3bb29777
[CI skip] Merge pull request #2019 from Neon72/patch-1
Fortune cookies
2020-06-24 20:18:18 +02:00
Neon72
cc8564a1f1
Fortune Cookies #2
You meant like this Cookie? (I realised 5 seconds after I posted the comment what you meant)
2020-06-24 20:15:07 +02:00
TheBusyBiscuit
750307d487
[CI skip] Merge pull request #2018 from TheBusyBiscuit/gitlocalize-12195
Added Tagalog
2020-06-24 20:11:50 +02:00
TheBusyBiscuit
0578c1349e
[CI skip] Merge pull request #2017 from TheBusyBiscuit/gitlocalize-12188
Added tagalog translations for researches
2020-06-24 20:11:34 +02:00
TheBusyBiscuit
8550092b26
[CI skip] Merge pull request #2011 from TheBusyBiscuit/gitlocalize-12174
Added some translations for Tagalog
2020-06-24 20:11:08 +02:00
TheBusyBiscuit
e26dd09664
[CI skip] Merge pull request #2016 from TheBusyBiscuit/gitlocalize-12187
Updated korean translations
2020-06-24 20:10:55 +02:00
Neon72
8b87fe8b06
Fortune Cookies Fix #1
I have "escaped" the single quote issue
2020-06-24 19:42:55 +02:00
TheBusyBiscuit
6840a1e957 Updated assets 2020-06-24 18:57:12 +02:00
Scott Gomez Andoy
6f5adfd31a Translate messages_tl.yml via GitLocalize 2020-06-24 16:55:51 +00:00
TheBusyBiscuit
d3f1dc6fb3 Fixes #1855 plus a few optimizations 2020-06-24 18:50:39 +02:00
LinoxGH
07224cc7d5 Added Enchantment Rune.
Added Enchantment Rune that applies a random enchantment on items.
Works similar to Soulbound Rune.
2020-06-24 16:28:35 +03:00
TheBusyBiscuit
8d373a3812 Minor changes 2020-06-24 14:54:43 +02:00
Scott Gomez Andoy
258467ef3a Translate researches_tl.yml via GitLocalize 2020-06-24 08:12:52 +00:00
AOJUCBJD
9019f268af Translate categories_ko.yml via GitLocalize 2020-06-24 08:07:47 +00:00
LinoxGH
573068283a Added the support for 1.13 2020-06-24 01:17:14 +03:00
LinoxGH
3278457441 Did the requested changes. 2020-06-24 01:06:48 +03:00
LinoxGH
9205b143ed Added Magic Pills.
Added Magic Pills which are used to cure zombie villagers.
Approved suggestion #178
2020-06-23 21:11:08 +03:00
MintFighter
47c53a0e36
Fortune cookies
a few more quotes for fortune cookies
2020-06-23 00:37:20 +02:00
TheBusyBiscuit
4504259546 Fixed a Unit test 2020-06-22 23:02:21 +02:00
TheBusyBiscuit
1c50d29fa8 Added Nether Quartz Ore Crusher Recipe 2020-06-22 22:49:07 +02:00
TheBusyBiscuit
bab94652bc Duplication glitch fix and performance improvements for Rainbow blocks 2020-06-22 22:45:14 +02:00
TheBusyBiscuit
bdb25b74ec Changed the texture of the Nether Star Reactor 2020-06-22 14:22:41 +02:00
TheBusyBiscuit
7d8ef33d78 Changed the texture for the Nuclear Reactor 2020-06-22 12:07:56 +02:00
Scott Gomez Andoy
c2a850b732 Translate resources_tl.yml via GitLocalize 2020-06-22 10:00:53 +00:00
Scott Gomez Andoy
2c1e1cacad Translate recipes_tl.yml via GitLocalize 2020-06-22 10:00:50 +00:00
Scott Gomez Andoy
8d6640693f Translate categories_tl.yml via GitLocalize 2020-06-22 10:00:48 +00:00
TheBusyBiscuit
a06e49cf13 Improvements to error logging in world loading 2020-06-22 01:55:11 +02:00
TheBusyBiscuit
f8182e4e3b Fixed Infused Magnet working even if you haven't researched it 2020-06-21 19:51:34 +02:00
TheBusyBiscuit
8e07ada321 Reduced technical debt / Refactoring 2020-06-21 10:26:54 +02:00
TheBusyBiscuit
68532ea38f Small improvement 2020-06-20 21:41:19 +02:00
TheBusyBiscuit
24cea8dade Further Improvements on the backwards-compatibility toggle 2020-06-20 21:39:41 +02:00
TheBusyBiscuit
c98aca37f1 Massive Performance improvements to GEO-Miner and Oil Pump 2020-06-20 19:33:37 +02:00
TheBusyBiscuit
4b38dd655d Added ReactorExplodeEvent to the API 2020-06-20 19:21:44 +02:00
TheBusyBiscuit
907fb1566a Fixes #2009 2020-06-20 18:52:30 +02:00
TheBusyBiscuit
1456245ee0 Added a toggle for backwards compatibility 2020-06-20 11:56:29 +02:00
TheBusyBiscuit
7059ad216c Refactoring and general improvements 2020-06-19 13:22:52 +02:00
Nameless
7eefde0982 Translate categories_zh-CN.yml via GitLocalize 2020-06-19 05:36:34 +00:00
TheBusyBiscuit
3c3dd48e9b Fixes #2005 2020-06-18 21:15:47 +02:00
TheBusyBiscuit
33db9151d6 Lots of refactoring and clean up 2020-06-17 14:56:48 +02:00
TheBusyBiscuit
5c14bc5cbe Refactoring 2020-06-17 01:24:47 +02:00
TheBusyBiscuit
f0b5d55c48 Reduced technical debt 2020-06-16 15:40:05 +02:00
TheBusyBiscuit
e82acc0b3c Refactoring 2020-06-16 15:36:44 +02:00
TheBusyBiscuit
0fd631813b [CI skip] Removed some deprecated stuff 2020-06-16 14:50:03 +02:00
TheBusyBiscuit
314907eb82 A ton of refactoring 2020-06-16 14:16:21 +02:00
TheBusyBiscuit
c77a2c2997 Did some long overdue refactoring 2020-06-16 01:54:18 +02:00
TheBusyBiscuit
d628f8586f Really really big refactoring and deprecation 2020-06-16 01:16:14 +02:00
TheBusyBiscuit
ffa3ea1c1b Further improvements to Unit Tests 2020-06-15 15:01:33 +02:00
TheBusyBiscuit
944c009afb [CI skip] Added Unit Tests for GEO Resources 2020-06-15 13:29:15 +02:00
TheBusyBiscuit
4efc10db15 Fixes #1907 2020-06-15 11:53:38 +02:00
TheBusyBiscuit
11a0d24fd1
[CI skip] Merge pull request #1983 from TheBusyBiscuit/gitlocalize-12080
Optimize some text and update to latest
2020-06-15 10:58:16 +02:00
TheBusyBiscuit
a298bea770
[CI skip] Merge pull request #2004 from TheBusyBiscuit/gitlocalize-12117
added translation
2020-06-15 10:54:51 +02:00
TheBusyBiscuit
cd8e22f1fc
[CI skip] Merge pull request #2002 from TheBusyBiscuit/gitlocalize-12115
refactor translations
2020-06-15 10:53:29 +02:00
Dams_
3cb48b36a6 Translate categories_fr.yml via GitLocalize 2020-06-15 08:37:09 +00:00
Pierre
c62756c482 Translate recipes_fr.yml via GitLocalize 2020-06-15 08:32:37 +00:00
Dams_
1c252e969f Translate recipes_fr.yml via GitLocalize 2020-06-15 08:32:36 +00:00
Edwin Kerforne
fd7b86d5be Translate recipes_fr.yml via GitLocalize 2020-06-15 08:32:35 +00:00
Dams_
50ed229443 Translate researches_fr.yml via GitLocalize 2020-06-15 08:30:57 +00:00
Muhammad Kamal Fergany
794012de16 Translate categories_ar.yml via GitLocalize 2020-06-14 23:54:43 +00:00
Luu7
6b8a0f3727 Translate categories_es.yml via GitLocalize 2020-06-14 20:40:49 +00:00
TheBusyBiscuit
44813c0c35
[CI skip] Merge pull request #1996 from TheBusyBiscuit/gitlocalize-12111
Updated Ukrainian categories
2020-06-14 20:17:30 +02:00
SoSeDiK
d2b692df84 Translate categories_uk.yml via GitLocalize 2020-06-14 18:01:56 +00:00
SoSeDiK
172687efb5 Translate categories_ru.yml via GitLocalize 2020-06-14 18:01:51 +00:00
TheBusyBiscuit
c640b16ce4 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-14 19:29:02 +02:00
TheBusyBiscuit
c84dd02b39 Fixes #1993 2020-06-14 19:28:51 +02:00
TheBusyBiscuit
98b0834daa Translate categories_de.yml via GitLocalize 2020-06-14 17:24:48 +00:00
TheBusyBiscuit
4855f0da86 Androids now have a seperate category 2020-06-14 18:58:38 +02:00
TheBusyBiscuit
2bead0cd3d Maybe fixes #1951 2020-06-14 13:34:31 +02:00
TheBusyBiscuit
2733b8a17b Fixes #1992 and changes to the fishing loot for androids 2020-06-14 13:01:38 +02:00
TheBusyBiscuit
81f7eefe23
[CI skip] Merge pull request #1990 from TheBusyBiscuit/gitlocalize-12101
Turkish Translation Update Pt.3
2020-06-14 10:47:10 +02:00
LinoxGH
8176cd4576 Translate researches_tr.yml via GitLocalize 2020-06-14 05:15:46 +00:00
LinoxGH
d544dddee7 Translate recipes_tr.yml via GitLocalize 2020-06-14 05:15:08 +00:00
Nameless
b5a899e4ae Translate messages_zh-CN.yml via GitLocalize 2020-06-14 03:18:17 +00:00
TheBusyBiscuit
cf24923e9c Fixes #1985 2020-06-14 02:39:01 +02:00
TheBusyBiscuit
85af23c17c Fixes #1988 2020-06-14 02:36:32 +02:00
TheBusyBiscuit
39035daea7
Merge pull request #1984 from TheBusyBiscuit/gitlocalize-12085
Updated czech translations
2020-06-13 21:28:57 +02:00
TheBusyBiscuit
c1ae5730cb
[CI skip] Merge pull request #1986 from TheBusyBiscuit/gitlocalize-12095
Turkish Translation Update Pt.1
2020-06-13 21:28:41 +02:00
TheBusyBiscuit
debc925bd0 Fixes #1976 2020-06-13 21:24:28 +02:00
LinoxGH
75afba8c99 Translate messages_tr.yml via GitLocalize 2020-06-13 15:25:13 +00:00
TheBusyBiscuit
e3dc17a9df [CI skip] Reduced technical debt 2020-06-13 13:52:53 +02:00
TheBusyBiscuit
4dbc66fc4e [CI skip] More refactoring 2020-06-13 13:05:22 +02:00
TheBusyBiscuit
872c83f1a6 [CI skip] Updated translators 2020-06-13 10:21:15 +02:00
mt-gitlocalize
89f9f82576 Translate messages_cs.yml via GitLocalize 2020-06-13 08:18:43 +00:00
frfole
f4329d021d Translate messages_cs.yml via GitLocalize 2020-06-13 08:18:42 +00:00
100petr
f04e0b58b8 Translate messages_cs.yml via GitLocalize 2020-06-13 08:18:41 +00:00
100petr
2622ce303d Translate categories_cs.yml via GitLocalize 2020-06-13 08:18:39 +00:00
TheBusyBiscuit
7baa3cb81b [CI skip] Reduced technical debt 2020-06-13 10:15:18 +02:00
Akira Yamazaki
10c10d5f55 Translate categories_zh-CN.yml via GitLocalize 2020-06-13 02:33:25 +00:00
Rothes
f8c81623d4 Translate messages_zh-CN.yml via GitLocalize 2020-06-13 02:33:24 +00:00
Nameless
b424440190 Translate messages_zh-CN.yml via GitLocalize 2020-06-13 02:33:23 +00:00
Nameless
640c8e8f01 Translate researches_zh-CN.yml via GitLocalize 2020-06-13 02:33:22 +00:00
TheBusyBiscuit
e45764ade1 Refactored a bunch of android-related things 2020-06-13 01:50:48 +02:00
TheBusyBiscuit
e7b7061b56 Added further documentation 2020-06-13 01:08:42 +02:00
TheBusyBiscuit
62ffb59ba2 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-13 01:02:39 +02:00
TheBusyBiscuit
bc274372ce
Merge pull request #1981 from PhanaticD/patch-2 2020-06-13 00:57:52 +02:00
Josh
0b4904831b
update 2020-06-12 18:52:54 -04:00
Josh
a232d82851
add check 2020-06-12 18:10:06 -04:00
Josh
5f8ae4b182
don't get it twice 2020-06-12 18:04:55 -04:00
Josh
e989969713
safety check in CustomItemDataService 2020-06-12 18:01:19 -04:00
Josh
56bd432719
check if null in getItemMeta 2020-06-12 17:29:04 -04:00
TheBusyBiscuit
5795ccfaba Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-12 23:24:55 +02:00
TheBusyBiscuit
1fc77c2ee2
[CI skip] Merge pull request #1978 from TheBusyBiscuit/gitlocalize-12075
Updated Russian messages
2020-06-12 23:18:43 +02:00
TheBusyBiscuit
63abe6f292
[CI skip] Merge pull request #1979 from TheBusyBiscuit/gitlocalize-12076
Updated Ukrainian messages
2020-06-12 23:17:53 +02:00
TheBusyBiscuit
0f98670616
[CI skip] Merge pull request #1980 from TheBusyBiscuit/gitlocalize-12077
Updated Ukrainian researches
2020-06-12 23:15:45 +02:00
Josh
6bc28d6b69
allow null meta 2020-06-12 17:09:57 -04:00
SoSeDiK
1a2fd0b078 Translate researches_uk.yml via GitLocalize 2020-06-12 19:52:23 +00:00
SoSeDiK
54c421c317 Translate messages_uk.yml via GitLocalize 2020-06-12 19:52:16 +00:00
SoSeDiK
fdf630aec4 Translate messages_ru.yml via GitLocalize 2020-06-12 19:52:11 +00:00
TheBusyBiscuit
fec7b163de Translate messages_ru.yml via GitLocalize 2020-06-12 19:52:10 +00:00
SoSeDiK
da6be4b00f Translate researches_ru.yml via GitLocalize 2020-06-12 19:52:04 +00:00
TheBusyBiscuit
b304ce14e1 [CI skip] Added lots more unit tests, some will be skipped 2020-06-12 19:18:29 +02:00
TheBusyBiscuit
9b2c378c3a [CI skip] Refactored unit tests 2020-06-12 18:55:09 +02:00
TheBusyBiscuit
7249a92bad
Merge pull request #1975 from TheBusyBiscuit/gitlocalize-12057
Add untranslated messages for messages_vi.yml
2020-06-11 13:52:00 +02:00
TheBusyBiscuit
c5cc2a86ff [CI skip] Refactoring and optimizations 2020-06-11 13:50:22 +02:00
nahkd123
8b648d428d Translate messages_vi.yml via GitLocalize 2020-06-11 11:32:51 +00:00
nahkd123
fda98cb9c6 Translate messages_vi.yml via GitLocalize 2020-06-11 11:21:22 +00:00
nahkd123
2d85d209ca Translate messages_vi.yml via GitLocalize 2020-06-11 11:15:33 +00:00
TheBusyBiscuit
79e8ca46ff Another small optimization 2020-06-11 11:42:24 +02:00
TheBusyBiscuit
aeab6df103 Small performance improvements for cargo networks 2020-06-11 10:08:08 +02:00
TheBusyBiscuit
25d970ea94 Fixes #1971 2020-06-11 09:34:29 +02:00
TheBusyBiscuit
5c20d3b470
Merge pull request #1963 from siaynoq/gold-ingot-pulverize
Adding recipe for vanilla Gold Ingot -> Gold Dust conversion
2020-06-11 00:43:49 +02:00
TheBusyBiscuit
f58d6aeff4 Small performance improvement 2020-06-11 00:43:17 +02:00
Siaynoq
1156cb33c0 Removed unneeded construction of GOLD_DUST 2020-06-11 08:33:37 +10:00
Siaynoq
5bf4604026 Removed unneeded array objects 2020-06-11 08:05:50 +10:00
TheBusyBiscuit
7acee959ce Lots of refactoring 2020-06-10 23:33:51 +02:00
TheBusyBiscuit
22650f53dd [Ci skip] Refactoring 2020-06-10 21:26:28 +02:00
TheBusyBiscuit
91f934b755
Merge pull request #1970 from TheBusyBiscuit/gitlocalize-12052
messages_es
2020-06-10 20:43:24 +02:00
Vravinite
837e8437c8 Translate messages_es.yml via GitLocalize 2020-06-10 16:48:39 +00:00
Luu7
46daf1f66b Translate messages_es.yml via GitLocalize 2020-06-10 16:48:37 +00:00
Vravinite
96fe2b7f02 Translate researches_es.yml via GitLocalize 2020-06-10 16:47:41 +00:00
TheBusyBiscuit
dc592605d6 [Ci skip] Fixed javadoc warning 2020-06-10 17:51:02 +02:00
TheBusyBiscuit
316d70ecc6 [CI skip] Added Unit Tests for /sf backpack 2020-06-10 17:48:00 +02:00
TheBusyBiscuit
9eb22db6de [CI skip] Added more Unit Tests 2020-06-10 17:33:14 +02:00
TheBusyBiscuit
da7291995b [CI skip] Added some Unit Tests for commands 2020-06-10 17:11:28 +02:00
JulieSigtunas
4f93af1616 Translate recipes_vi.yml via GitLocalize 2020-06-10 13:37:30 +00:00
JustAPieOP
05df407e0e Translate recipes_vi.yml via GitLocalize 2020-06-10 13:37:29 +00:00
justsiro
c74fb6560b Translate recipes_vi.yml via GitLocalize 2020-06-10 13:37:28 +00:00
nahkd123
ae1c0f42e6 Translate recipes_vi.yml via GitLocalize 2020-06-10 13:37:27 +00:00
TheBusyBiscuit
1ec2fd1b74 Translate messages_de.yml via GitLocalize 2020-06-10 12:07:10 +00:00
TheBusyBiscuit
919c86aebe
[CI skip] Merge pull request #1961 from TheBusyBiscuit/gitlocalize-12043
Translate added section in messags.yml into Japanese.
2020-06-10 09:59:53 +02:00
TheBusyBiscuit
79198a1f1f
[Ci skip] Merge pull request #1962 from TheBusyBiscuit/gitlocalize-12044
Translate added section in researches.yml into Japanese.
2020-06-10 09:57:57 +02:00
TheBusyBiscuit
da8d3de538
[Ci skip] Merge pull request #1965 from TheBusyBiscuit/gitlocalize-12046
Translation 6
2020-06-10 09:57:26 +02:00
TheBusyBiscuit
9f3a204313
[CI skip] Merge pull request #1960 from TheBusyBiscuit/gitlocalize-12042
Updated german research translations
2020-06-10 09:55:46 +02:00
Turret
9e8d2d6450 Translate researches_sv.yml via GitLocalize 2020-06-10 05:05:07 +00:00
Siaynoq
c44730c589 Adding recipe for vanilla Gold Ingot -> Gold Dust conversion 2020-06-10 14:06:03 +10:00
bito-blosh
d7700f9140 Translate researches_ja.yml via GitLocalize 2020-06-10 03:05:42 +00:00
bito-blosh
13091e2e5d Translate messages_ja.yml via GitLocalize 2020-06-10 03:05:07 +00:00
TheBusyBiscuit
005d2a3c6a Fixed lore 2020-06-09 23:36:01 +02:00
TheBusyBiscuit
ced1580844 Translate researches_de.yml via GitLocalize 2020-06-09 21:26:07 +00:00
TheBusyBiscuit
b659e51008
Merge pull request #1953 from TheBusyBiscuit/feature/miner
Added Industrial Miner & Removed Digital Miner
2020-06-09 23:23:56 +02:00
TheBusyBiscuit
504df60a73
Merge pull request #1957 from TheBusyBiscuit/gitlocalize-12028
Added danish translations for categories
2020-06-09 23:23:18 +02:00
TheBusyBiscuit
d645fcc75b [CI skip] Updated translators list 2020-06-09 23:23:02 +02:00
TheBusyBiscuit
df947e0967 [CI skip] Refactoring 2020-06-09 23:21:37 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
4f7b06be4c Changes to organic food/fertilizer 2020-06-09 00:10:32 +02:00
TheBusyBiscuit
abe8afab67 More balancing for Organic Food/Fertilizer 2020-06-08 23:25:45 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
mt-gitlocalize
cb68c92dc5 Translate categories_da.yml via GitLocalize 2020-06-08 21:00:05 +00:00
Mini-kun
633f84178e Translate categories_da.yml via GitLocalize 2020-06-08 21:00:03 +00:00
TheBusyBiscuit
70738a45ee Refactored recipe service for electric furnaces 2020-06-08 14:20:01 +02:00
TheBusyBiscuit
615e0c07a2 Minor changes 2020-06-07 17:48:10 +02:00
TheBusyBiscuit
586a6970ed
Updated translator list 2020-06-05 18:18:18 +02:00
Eylonnn
8ac61a9867 Translate resources_he.yml via GitLocalize 2020-06-05 16:15:30 +00:00
TheBusyBiscuit
fcd17d3a5a Updated lore for advanced industrial miner 2020-06-05 14:37:31 +02:00
TheBusyBiscuit
8bde659daf The Advanced Miner now preserves buckets 2020-06-05 14:34:24 +02:00
TheBusyBiscuit
cd79775402 Added Advanced Industrial Miner 2020-06-05 14:13:53 +02:00
TheBusyBiscuit
e41eca9caa Refactoring 2020-06-05 14:09:32 +02:00
TheBusyBiscuit
15aabd6a63 Attributes are now hidden 2020-06-05 00:37:21 +02:00
TheBusyBiscuit
4f21fd03bc Finished Industrial Miner 2020-06-05 00:21:45 +02:00
TheBusyBiscuit
c8f78379a1 Added Industrial Miner 2020-06-05 00:00:07 +02:00
TheBusyBiscuit
4664fb00fe Added back researches 2020-06-04 23:59:58 +02:00
TheBusyBiscuit
aebd03301d Added new ItemStacks 2020-06-04 23:56:08 +02:00
TheBusyBiscuit
618bbfff24 Optimized Fuel 2020-06-04 23:55:53 +02:00
TheBusyBiscuit
7e8a63bff8 Dried Kelp Blocks are now valid coal generator fuel 2020-06-04 15:26:35 +02:00
TheBusyBiscuit
968b3df10a Relocated Multiblock class 2020-06-03 09:51:51 +02:00
TheBusyBiscuit
31a9b69651 Refactored Backpacks 2020-06-02 13:58:03 +02:00
TheBusyBiscuit
595767ad03 Some cleanup 2020-06-02 13:50:29 +02:00
TheBusyBiscuit
0faaef9b25 Removed Digital Miners 2020-06-01 14:10:22 +02:00
TheBusyBiscuit
f65ac6b68c Lava can no longer be used as a coolant for reactors 2020-06-01 14:02:49 +02:00
TheBusyBiscuit
2f09470b51 [Ci skip] Reduced technical debt 2020-06-01 13:52:04 +02:00
PhanaticD
dc351f51ad remove metadata on entity death, and when items are removed from pedestal. Also remove references to "item_placed" I do not see anywhere where this key is actually set, maybe leftover from old code? 2020-06-01 01:19:41 -04:00
TheBusyBiscuit
4bb81c0f5f Updated changelog 2020-05-31 00:38:19 +02:00
Rafrael17k
5898c04d32 Translate messages_th.yml via GitLocalize 2020-05-30 22:23:49 +00:00
Cupjok
1584a08118 Translate messages_th.yml via GitLocalize 2020-05-30 22:23:47 +00:00
phoomin2012
c5fb8d6821 Translate messages_th.yml via GitLocalize 2020-05-30 22:23:45 +00:00
TheBusyBiscuit
c85b29c009 Fixes #1943 2020-05-30 16:21:13 +02:00
TheBusyBiscuit
5378341839 [Ci skip] Refactoring and proper deprecation of the HandledBlock class 2020-05-30 14:53:29 +02:00
TheBusyBiscuit
343a18a95d Added dried Kelp and bone block recipes to the Electric Press 2020-05-30 13:36:48 +02:00
TheBusyBiscuit
929f26d103 [CI skip] Reduced technical debt 2020-05-30 13:21:17 +02:00
TheBusyBiscuit
d19da209d5 Fixes #1942 2020-05-29 16:07:02 +02:00
TheBusyBiscuit
efd9903ace [CI skip] Refactoring 2020-05-29 12:07:24 +02:00
TheBusyBiscuit
6ca1f7dca9 [Ci skip] Removed deprecated stuff 2020-05-29 01:39:21 +02:00
TheBusyBiscuit
7039eb1312 [skip] Removed weird line breaks und updated translator list 2020-05-28 12:47:01 +02:00
mt-gitlocalize
2b8bed7b3d Translate researches_ko.yml via GitLocalize 2020-05-28 10:39:53 +00:00
20181241
86121dce80 Translate researches_ko.yml via GitLocalize 2020-05-28 10:39:51 +00:00
BlWon
8b5d424f1b Translate researches_ko.yml via GitLocalize 2020-05-28 10:39:50 +00:00
kwonms871
69cffa1d0d Translate researches_ko.yml via GitLocalize 2020-05-28 10:39:48 +00:00
AOJUCBJD
b04ee62530 Translate researches_ko.yml via GitLocalize 2020-05-28 10:39:46 +00:00
TheBusyBiscuit
e2b979fca9 Pushing a new "stable" build 2020-05-27 13:43:52 +02:00
TheBusyBiscuit
982a07262e Another relocation 2020-05-26 10:21:58 +02:00
TheBusyBiscuit
4af26f3b00 [Ci skip] Added some more basic tests 2020-05-26 09:57:45 +02:00
TheBusyBiscuit
1b951f77ea [CI skip] Added an extremely simple ResearchSetup test 2020-05-25 12:58:01 +02:00
TheBusyBiscuit
a34abcb1e7 Some refactoring, also fixes #1935 2020-05-24 20:19:22 +02:00
TheBusyBiscuit
7ae16f8358 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-05-24 19:13:03 +02:00
TheBusyBiscuit
f38c895780 [CI skip] Updated MockBukkit and re-enabled Deathpoint tests 2020-05-24 19:12:45 +02:00
bito-blosh
aab6624ce0
Fixed android ATTACK part deals wrong damage 2020-05-24 15:39:48 +09:00
TheBusyBiscuit
23c2ab0f65 Fixed custom player heads errors 2020-05-24 01:57:38 +02:00
TheBusyBiscuit
6a4e23853c Added more Unit Tests 2020-05-24 01:48:42 +02:00
TheBusyBiscuit
0af8c41eeb Added a toggle for #1924 and fixes #1933 2020-05-24 01:11:10 +02:00
TheBusyBiscuit
efcc9c1a4b [CI skip] Refactoring 2020-05-24 00:49:27 +02:00
TheBusyBiscuit
323ddc949b Fixes #1926 2020-05-23 20:34:37 +02:00
TheBusyBiscuit
6cdd1c66c4
[CI skip] Merge pull request #1931 from TheBusyBiscuit/gitlocalize-11837
Final messages_it
2020-05-23 20:27:56 +02:00
TheBusyBiscuit
62cbbf6dbc
[CI skip] Merge pull request #1930 from TheBusyBiscuit/gitlocalize-11836
Another small edit
2020-05-23 20:27:45 +02:00
TheBusyBiscuit
bb1789cecc
[CI skip] Merge pull request #1929 from TheBusyBiscuit/gitlocalize-11835
Final Categories_it
2020-05-23 20:27:29 +02:00
TheBusyBiscuit
adcb6851fa
[CI skip] Merge pull request #1928 from TheBusyBiscuit/gitlocalize-11834
Final Researches_it
2020-05-23 20:27:15 +02:00
TheBusyBiscuit
7e7aba3db3
[CI skip] Merge pull request #1927 from TheBusyBiscuit/gitlocalize-11833
One small edit
2020-05-23 20:26:51 +02:00
TheBusyBiscuit
a96f85ece4 [CI skip] Coverage ahoy! 2020-05-23 20:18:43 +02:00
Sfiguz7
822f9d1070 Translate messages_it.yml via GitLocalize 2020-05-23 11:41:39 +00:00
Matteo
38ea8e09fe Translate messages_it.yml via GitLocalize 2020-05-23 11:41:38 +00:00
Sfiguz7
2625a520e9 Translate recipes_it.yml via GitLocalize 2020-05-23 11:36:44 +00:00
Matteo
6dd57a9939 Translate categories_it.yml via GitLocalize 2020-05-23 11:35:50 +00:00
Riccardo Lo Faro
0efe1854de Translate researches_it.yml via GitLocalize 2020-05-23 11:35:09 +00:00
Sfiguz7
fdcc2a7449 Translate researches_it.yml via GitLocalize 2020-05-23 11:35:07 +00:00
Matteo
7b4d9a2f99 Translate researches_it.yml via GitLocalize 2020-05-23 11:35:05 +00:00
alessandrobasi
5413733953 Translate researches_it.yml via GitLocalize 2020-05-23 11:35:03 +00:00
Matteo
8f5f2ff746 Translate resources_it.yml via GitLocalize 2020-05-23 11:08:53 +00:00
TheBusyBiscuit
a6a4a0a671 [CI skip] Infrastructure for further Unit Testing 2020-05-22 18:01:25 +02:00
TheBusyBiscuit
902367de0c Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-05-22 16:40:33 +02:00
TheBusyBiscuit
de93daf9be [CI skip] Updated MockBukkit 2020-05-22 16:40:26 +02:00
TheBusyBiscuit
c51ff84640
Merge pull request #1925 from WalshyDev/fix/walshys-fixes
Add a way to reload BlockMenu
2020-05-22 16:36:52 +02:00
Daniel Walsh
9ddbaf70cd So... I can't test this 2020-05-22 15:02:26 +01:00
Daniel Walsh
984a96bcb5 REEE I can't sleep 😢 2020-05-22 14:42:28 +01:00
TheBusyBiscuit
a94da8a372 [Ci skip] Removed unused imports 2020-05-22 12:19:40 +02:00
Daniel Walsh
8db67af455 Requested pickiness 2020-05-22 10:28:21 +01:00
Daniel Walsh
3048f0f6a0 Unit tests save the day 2020-05-22 07:11:58 +01:00
Daniel Walsh
f269c37f76 Add build num to UpdaterService 2020-05-22 07:08:17 +01:00
Daniel Walsh
fffd9921b3 Doc 2020-05-22 06:51:39 +01:00
Daniel Walsh
f049a75006 Add a way to reload menus 2020-05-22 06:43:02 +01:00
FabioZumbi12
7a6e6cd8eb Missing space on line 2020-05-22 01:13:59 -03:00
FabioZumbi12
d1a968d4ff Changed to Block explode, and added the event to Explosive Shovel 2020-05-22 01:07:20 -03:00
FabioZumbi12
388ed255b8 Fix compatibility with other plugins firing bukkit explosion event to do not drop near blocks on pickaxe area if the block was removed from explosion event. 2020-05-22 00:24:18 -03:00
TheBusyBiscuit
9a85120597 Removed debug message 👀 2020-05-21 19:09:49 +02:00
TheBusyBiscuit
69d32bd6f2 Fixes TheBusyBiscuit/ChestTerminal#25 2020-05-21 18:51:53 +02:00
TheBusyBiscuit
04a7435f2b [CI skip] #GiveMeMoreCoverage 2020-05-21 13:44:00 +02:00
TheBusyBiscuit
624f0b298e [Ci skip] Removed debug message 2020-05-21 12:45:04 +02:00
TheBusyBiscuit
0292ee6cec
[CI skip] Merge pull request #1922 from TheBusyBiscuit/gitlocalize-11801
Added indonesian resource translations
2020-05-21 12:43:01 +02:00
TheBusyBiscuit
df6d5cef81
[CI skip] Merge pull request #1923 from TheBusyBiscuit/gitlocalize-11802
Added macedonian resource translations
2020-05-21 12:42:31 +02:00
Silent
c0dd15cc87 Translate resources_mk.yml via GitLocalize 2020-05-21 10:41:49 +00:00
Dicky Ramadhoni
a9aa3064e1 Translate resources_id.yml via GitLocalize 2020-05-21 10:40:42 +00:00
Silent
22fa877110 Translate categories_mk.yml via GitLocalize 2020-05-21 10:39:10 +00:00
TheBusyBiscuit
83d5eafb54 [CI skip] Added Unit Tests for Waypoints 2020-05-21 12:35:21 +02:00
TheBusyBiscuit
ec33df8e93 [CI skip] Added a little more javadocs 2020-05-20 17:33:18 +02:00
TheBusyBiscuit
acd759ae4c [CI skip] Refactoring 2020-05-20 17:20:52 +02:00
TheBusyBiscuit
0d00e52c29 [CI skip] Added SlimefunUtils.getCustomHead() 2020-05-20 16:47:56 +02:00
TheBusyBiscuit
27fd81298c [CI skip] Added more Unit Tests 2020-05-18 17:11:12 +02:00
Daniel Walsh
c4cb29b897 Add location data to error message 2020-05-18 10:06:24 +01:00
TheBusyBiscuit
dd633df96f [CI skip] Provoking our discord webhook 2020-05-17 20:20:08 +02:00
TheBusyBiscuit
e3ba751cf9 [CI skip] Added more unit tests to cover multiblocks 2020-05-17 16:41:16 +02:00
TheBusyBiscuit
d7a7230d6c [CI skip] Refined the newly added Unit Tests 2020-05-17 15:00:46 +02:00
TheBusyBiscuit
c69a86ae42 [CI skip] Added a Research unlocking unit test 2020-05-17 14:54:16 +02:00
TheBusyBiscuit
65228fbeb1 Added a callback to Research#unlock(...) 2020-05-17 14:13:46 +02:00
TheBusyBiscuit
de8fb5ccef [ci skip] refactoring 2020-05-17 12:49:11 +02:00
TheBusyBiscuit
9c53228ba7
[CI skip] Merge pull request #1916 from TheBusyBiscuit/gitlocalize-11778
Added thai resources
2020-05-17 12:05:03 +02:00
TheBusyBiscuit
fc4dd8b105
[CI skip] Merge pull request #1915 from TheBusyBiscuit/gitlocalize-11777
Added thai recipes
2020-05-17 12:04:58 +02:00
TheBusyBiscuit
6eebb9c04d AncientAltar now has a speed variable 2020-05-17 00:40:07 +02:00
TheBusyBiscuit
dec22b9960 Added WaypointCreateEvent 2020-05-16 17:51:42 +02:00
TheBusyBiscuit
3a2cced5d0 Infused Magnets can no longer be placed down 2020-05-16 17:04:16 +02:00
film2860
7f60b4a67e Translate resources_th.yml via GitLocalize 2020-05-16 13:42:17 +00:00
TheBusyBiscuit
b3a3f4511b [CI skip] Fixed PerWorldSettingsService handling some files wrongly 2020-05-16 15:40:22 +02:00
TheBusyBiscuit
7e137fb360 [CI skip] Refactoring 2020-05-16 15:06:32 +02:00
TheBusyBiscuit
e07933a911 [ci skip] Included translators in latest github improvement 2020-05-16 14:22:47 +02:00
Rafrael17k
0b3b308e24 Translate recipes_th.yml via GitLocalize 2020-05-16 12:11:52 +00:00
film2860
a315aa5876 Translate recipes_th.yml via GitLocalize 2020-05-16 12:11:50 +00:00
TheBusyBiscuit
9cafd147aa [ci skip] New texture for restored backpacks 2020-05-16 13:38:26 +02:00
TheBusyBiscuit
29d2aaf055 Fixes #1914 2020-05-16 12:42:46 +02:00
TheBusyBiscuit
c4012fe697 [ci skip] Reduced mojang.com connection errors 2020-05-16 12:04:19 +02:00
TheBusyBiscuit
d181d54245 Some refactoring 2020-05-16 02:16:29 +02:00
beSnow
733599691a Changed some stuff in BeeWingListener, Should be more performance friendly now. 2020-05-15 23:50:41 +02:00
beSnow
84bce963b9 Added Bee Armor to researches_en. 2020-05-15 23:49:59 +02:00
beSnow
6311f6ec2e Fixed some redundancies 2020-05-15 18:18:07 +02:00
beSnow
ba886d275d Added the research text to the researches_en Language file 2020-05-15 18:01:40 +02:00
beSnow
f0dbe746c6 Fixed the Wildcard 2020-05-15 17:51:08 +02:00
TheBusyBiscuit
11383cad1d Fixes #1829 2020-05-15 17:45:13 +02:00
TheBusyBiscuit
d5f430c723 Refactoring 2020-05-15 17:44:57 +02:00
TheBusyBiscuit
6553aeb3e1 Fixes #1883 2020-05-15 16:57:47 +02:00
TheBusyBiscuit
c4a3cdc833 Fixed Organic food/fertilizer not being recognized 2020-05-15 16:47:01 +02:00
TheBusyBiscuit
6aeee8f4be [ci skip] Reduced some technical debt 2020-05-15 16:10:25 +02:00
TheBusyBiscuit
3aff637f4f [CI skip] more Unit Tests 2020-05-15 12:16:46 +02:00
beSnow
d88c815005 Fixed Mincraft Version Compatibility and some IDE weirdness 2020-05-15 11:22:22 +02:00
TheBusyBiscuit
9f4557185a
Merge pull request #1910 from Sfiguz7/tests
setBackpackId param type change, fix in bp command
2020-05-15 09:59:02 +02:00
Sfiguz7
00fa225d4a Made BackpackListener#setBackpackId accept OfflinePlayer instead, fix in BackpackCommand 2020-05-15 09:11:15 +02:00
TheBusyBiscuit
d11bfe8278 [CI skip] Added more Unit Tests 2020-05-15 01:16:25 +02:00
TheBusyBiscuit
741d18a8e8 Fixes #1903 2020-05-15 00:36:39 +02:00
beSnow
865f97d1ba Added some documentation 2020-05-14 23:35:21 +02:00
beSnow
0d0a4aa578 Fixed some Wildcards (Auto formater messed with it) 2020-05-14 23:14:27 +02:00
beSnow
f0f134ea72 Added Bee Armor (and all the things to make it function) 2020-05-14 22:50:15 +02:00
TheBusyBiscuit
886121e226 Fixes #1908 2020-05-14 20:07:18 +02:00
TheBusyBiscuit
c2fb42b721 Relocated an Interface 2020-05-14 20:05:08 +02:00
TheBusyBiscuit
bbd3250206
[ci skip] Merge pull request #1905 from TheBusyBiscuit/gitlocalize-11753
Arabic Messages Translation Update
2020-05-14 15:52:45 +02:00
Muhammad Kamal Fergany
a94cdd0b7d Translate researches_ar.yml via GitLocalize 2020-05-14 13:36:28 +00:00
Muhammad Kamal Fergany
9bc644a7a3 Translate messages_ar.yml via GitLocalize 2020-05-14 13:28:31 +00:00
TheBusyBiscuit
219bf89f71 Translate messages_ar.yml via GitLocalize 2020-05-14 13:28:29 +00:00
TheBusyBiscuit
62f54c0587
Merge pull request #1892 from TheBusyBiscuit/tests
Added Unit Tests via MockBukkit
2020-05-14 00:01:40 +02:00
TheBusyBiscuit
cf32902730 Fixed DyedBackpacks 2020-05-13 23:52:22 +02:00
TheBusyBiscuit
f97e0cacd3
[CI skip] This will be the final test 2020-05-13 23:35:22 +02:00
TheBusyBiscuit
97efe2b810
[Ci skip] Still testing things 2020-05-13 23:27:11 +02:00
TheBusyBiscuit
4de8af5416
[CI skip] Testing out the webhook once more 2020-05-13 23:23:11 +02:00
TheBusyBiscuit
9d05da6951
[CI skip] This is working now :O 2020-05-13 23:15:35 +02:00
TheBusyBiscuit
65ffd131a2
[CI skip] Either this works or I'll punch a blob. 2020-05-13 23:08:03 +02:00
TheBusyBiscuit
b52aec39c6
[CI skip] This may work now 2020-05-13 23:04:15 +02:00
TheBusyBiscuit
9e85bc9269
[CI skip] Another test run 2020-05-13 22:58:30 +02:00
TheBusyBiscuit
4c6b0109db
[Ci skip] Triggering yet another run 2020-05-13 22:43:20 +02:00
TheBusyBiscuit
51bbd6781d
[CI skip] Triggering another run 2020-05-13 22:36:23 +02:00
TheBusyBiscuit
f1b5d6fd72
[CI skip] Will revert this later 2020-05-13 22:31:34 +02:00
TheBusyBiscuit
ab8f07b271
[CI skip] Go test 2020-05-13 22:23:19 +02:00
TheBusyBiscuit
66c7584d76
[CI skip] Another test 2020-05-13 22:20:31 +02:00
TheBusyBiscuit
3adbc84d53 Removed some longtime deprecated methods 2020-05-12 22:32:59 +02:00
TheBusyBiscuit
67121760cd Added Unit Tests for "Soulboundness" 2020-05-12 22:12:42 +02:00
Daniel Walsh
c0a530f532 Fix conflict 2020-05-12 20:17:34 +01:00
Daniel Walsh
6634d44033
Merge branch 'tests' into feature/soulbound-key 2020-05-12 20:15:47 +01:00
Daniel Walsh
0bd78104cc Requested changes and performance improvements 2020-05-12 18:43:34 +01:00
TheBusyBiscuit
471a271518 Another one bites the Unit Tests 2020-05-12 00:50:01 +02:00
TheBusyBiscuit
05e36bf839
Merge pull request #1898 from Sfiguz7/tests
Backpack command
2020-05-12 00:08:42 +02:00
TheBusyBiscuit
736f7bc542 Added an additional validation and unit test 2020-05-11 23:20:40 +02:00
TheBusyBiscuit
d01a7d2186 Added Unit Tests for NetworkManager and Network class 2020-05-11 23:02:24 +02:00
Sfiguz7
8b09111b4a Overridden description getter 2020-05-11 22:19:33 +02:00
TheBusyBiscuit
3597fc0388 Reduced technical debt 2020-05-11 18:56:01 +02:00
Sfiguz7
8c0ff9acfb Now cloning :/ Also fixed double key in messages 2020-05-11 16:58:58 +02:00
Sfiguz7
b2856755d9 Added Javadocs, removed unnecessary parameter 2020-05-11 16:11:41 +02:00
Sfiguz7
23fdd45b3d Messages fixes, Refactored HiddenBackpack to be dedicated to restored bp 2020-05-11 15:35:35 +02:00
Sfiguz7
bcb2add2a6 Integrity! HiddenBackpack now accepts size, restored bp has 54 2020-05-11 15:19:50 +02:00
Sfiguz7
da25ac9f80 Redone fixes without formatting 2020-05-11 09:24:01 +02:00
Sfiguz7
cb8efb2d55 Revert "Last fixes(?)"
This reverts commit 21f21ed671.
2020-05-11 09:19:25 +02:00
Sfiguz7
21f21ed671 Last fixes(?) 2020-05-11 02:18:06 +02:00
Daniel Walsh
b4f19e8548 Document 2020-05-11 01:12:41 +01:00
Daniel Walsh
bd02eb9570 Tested! 2020-05-11 01:09:49 +01:00
Daniel Walsh
8795900ec6 Quick soulbound key to speed this up 2020-05-11 00:50:40 +01:00
Sfiguz7
cedd749edb Split a line for readability 2020-05-11 01:46:12 +02:00
Sfiguz7
e021fb9ce3 Tweaked, requested changes added 2020-05-11 01:25:59 +02:00
Sfiguz7
0fc0a0be29 I said, added a command! 2020-05-10 23:28:30 +02:00
Sfiguz7
fcf28fdf7f Added a command to retrieve lost backpacks 2020-05-10 23:27:09 +02:00
TheBusyBiscuit
ccad2982ab Fixes #1897 2020-05-10 21:37:24 +02:00
TheBusyBiscuit
ea200b37aa Added UpdaterService#isEnabled() 2020-05-10 21:35:48 +02:00
TheBusyBiscuit
0eeef20b1f A little bit more Unit Tests 2020-05-10 17:13:31 +02:00
TheBusyBiscuit
feadc9f231 Some refactoring and documentation 2020-05-10 16:54:33 +02:00
TheBusyBiscuit
990b717339 Added ItemStackWrapper Unit Tests 2020-05-10 15:34:04 +02:00
TheBusyBiscuit
d39906866d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into tests
2020-05-10 10:32:55 +02:00
TheBusyBiscuit
eacbd2c5c1 Refactored Talismans a bit 2020-05-10 10:31:28 +02:00
jacky
bacd14a833 Removed unuse parameter for consumeItem() 2020-05-10 10:54:19 +08:00
jacky
64451244cd Removed unuse parameter for consumeItem() 2020-05-10 10:43:53 +08:00
jacky
13afbecb90 Fixed Ender Talisman to be consumed inside Ender Chest 2020-05-10 10:41:31 +08:00
TheBusyBiscuit
71d13869a1 Added Unit Tests for Player Profile and related 2020-05-10 02:22:38 +02:00
TheBusyBiscuit
6a0c45c788 Removed Reflection 2020-05-09 21:39:59 +02:00
TheBusyBiscuit
4df99b6fd8 You better work :reeeee: 2020-05-09 20:31:03 +02:00
TheBusyBiscuit
1646d7c82d Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into tests

Conflicts:
	src/main/java/me/mrCookieSlime/Slimefun/api/Slimefun.java
2020-05-09 18:24:11 +02:00
TheBusyBiscuit
c93c6cfa68 Small refactoring 2020-05-09 18:00:10 +02:00
jacky
d806837000 Fixes Prismarine Brick duplication bug with Grind Stone #1851 2020-05-09 22:04:27 +08:00
jacky
e329560d6d Revert "Fixes Prismarine Brick duplication bug with Grind Stone #1829"
This reverts commit cd0baa30
2020-05-09 22:04:07 +08:00
jacky
cd0baa307e Fixes Prismarine Brick duplication bug with Grind Stone #1829 2020-05-09 21:22:25 +08:00
TheBusyBiscuit
0e6ce77fd8 Deprecated these methods again 2020-05-09 10:51:55 +02:00
TheBusyBiscuit
cf777126ba [CI skip] Deprecated two methods because the Research class will move 2020-05-09 10:48:02 +02:00
TheBusyBiscuit
922444c046 Added new api method for researches 2020-05-09 10:41:36 +02:00
TheBusyBiscuit
c4026966a2 Removed api method 2020-05-09 10:35:21 +02:00
TheBusyBiscuit
d8c06a2270 Updated repository names 2020-05-09 10:17:04 +02:00
TheBusyBiscuit
b30190da5c Refactoring 2020-05-08 23:05:29 +02:00
TheBusyBiscuit
5360e4d085 MOOORE Unit Tests 2020-05-08 22:09:08 +02:00
TheBusyBiscuit
974657fadc Fixed some unit tests 2020-05-08 21:26:18 +02:00
TheBusyBiscuit
cc21fb8fe3 Removed temporary migration method 2020-05-08 19:21:49 +02:00
TheBusyBiscuit
a37fe6d62a disabledItems now also uses the Worlds UUID 2020-05-08 19:07:06 +02:00
TheBusyBiscuit
ebf6725d7e Prevent World Settings from saving inside tests 2020-05-08 19:05:03 +02:00
TheBusyBiscuit
eb321e9ee5 Lots more refactoring 2020-05-08 18:59:51 +02:00
TheBusyBiscuit
dc137d04bf Player Profiles are now truly asynchronous 2020-05-08 18:47:25 +02:00
TheBusyBiscuit
a4ebd663d5 Refactoring and Research Unit tests 2020-05-08 17:55:48 +02:00
TheBusyBiscuit
aa897a5de7 More tests and relocated a class 2020-05-08 17:13:16 +02:00
TheBusyBiscuit
a2512ce03a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-08 16:00:31 +02:00
TheBusyBiscuit
c3dbe8f34a Maybe fixed the Electric Smeltery recipe priorities 2020-05-08 15:54:14 +02:00
TheBusyBiscuit
66ac945b5f No such thing as too many Unit Tests 2020-05-08 15:44:12 +02:00
TheBusyBiscuit
a3afe615b5 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into tests 2020-05-07 20:39:42 +02:00
TheBusyBiscuit
528edc80d0 Fixes #1873 2020-05-07 20:38:51 +02:00
TheBusyBiscuit
de1af960bb [CI skip] Updated translator list 2020-05-07 20:35:03 +02:00
TheBusyBiscuit
51708d1eb1
[CI skip] Merge pull request #1887 from TheBusyBiscuit/gitlocalize-11632
Added bulgarian categories
2020-05-07 20:34:47 +02:00
TheBusyBiscuit
2d3cfaee73 Updated PerWorldSettings 2020-05-07 20:32:37 +02:00
DNBGlol
97b352b4bc Translate categories_bg.yml via GitLocalize 2020-05-07 18:29:47 +00:00
Silent
0db56b4e7c Translate recipes_mk.yml via GitLocalize 2020-05-07 18:29:28 +00:00
TheBusyBiscuit
9e63f1ce79 Added Unit Tests for Categories 2020-05-07 19:56:45 +02:00
TheBusyBiscuit
220d5ef41f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
into tests

Conflicts:
	CHANGELOG.md
2020-05-07 18:18:09 +02:00
TheBusyBiscuit
0b416c3201 More tests 2020-05-07 18:00:44 +02:00
TheBusyBiscuit
41b0356bbc Refactoring 2020-05-07 18:00:30 +02:00
Luu7
8d26c83304 Translate messages_es.yml via GitLocalize 2020-05-07 15:34:48 +00:00
TheBusyBiscuit
8577b9ef50 Added Unit Tests for ItemSetting<T> 2020-05-07 17:12:31 +02:00
TheBusyBiscuit
7e04566393 Further unit tests and jacoco coverage reports 2020-05-07 14:28:54 +02:00
KillerXCoder
5845b224e4 Translate messages_sk.yml via GitLocalize 2020-05-07 09:58:21 +00:00
KillerXCoder
558c440fad Translate recipes_sk.yml via GitLocalize 2020-05-07 09:55:06 +00:00
TheBusyBiscuit
b456da9ffc First Unit Tests 2020-05-06 22:08:15 +02:00
mt-gitlocalize
1e67550118 Translate recipes_ko.yml via GitLocalize 2020-05-05 17:36:24 +00:00
AOJUCBJD
be8f7d9b1b Translate recipes_ko.yml via GitLocalize 2020-05-05 17:36:22 +00:00
kwonms871
14a9f9dde6 Translate recipes_ko.yml via GitLocalize 2020-05-05 17:36:20 +00:00
TheBusyBiscuit
6d569f0ead
[CI skip] Merge pull request #1871 from TheBusyBiscuit/gitlocalize-11581
Translated recipes to Ukrainian
2020-05-04 21:22:12 +02:00
TheBusyBiscuit
6565b861f2
[CI skip] Merge pull request #1861 from TheBusyBiscuit/gitlocalize-11569
Added Ukrainian categories
2020-05-04 21:22:01 +02:00
TheBusyBiscuit
98406fe9a5
[CI skip] Merge pull request #1868 from TheBusyBiscuit/gitlocalize-11577
Translated researches to Ukrainian
2020-05-04 21:21:51 +02:00
TheBusyBiscuit
352ca54b37
[CI skip] Merge pull request #1859 from TheBusyBiscuit/gitlocalize-11567
Translated resources to Ukrainian
2020-05-04 21:21:37 +02:00
TheBusyBiscuit
d1a095800e
[CI skip] Merge pull request #1860 from TheBusyBiscuit/gitlocalize-11568
Added Ukrainian messages
2020-05-04 21:21:26 +02:00
TheBusyBiscuit
e95c5939a3 [CI skip] Added Ukrainian language 2020-05-04 21:21:01 +02:00
bito-blosh
1fb1a149db Translate messages_ja.yml via GitLocalize 2020-05-04 18:38:46 +00:00
TheBusyBiscuit
d74c2cff8b Translate messages_ja.yml via GitLocalize 2020-05-04 18:38:45 +00:00
SoSeDiK
b4fd2510cb Translate recipes_uk.yml via GitLocalize 2020-05-04 16:14:12 +00:00
SoSeDiK
3104504628 Translate recipes_ru.yml via GitLocalize 2020-05-04 15:58:28 +00:00
SoSeDiK
09a7578e10 Translate researches_ru.yml via GitLocalize 2020-05-04 15:44:24 +00:00
SoSeDiK
6428e84b17 Translate researches_uk.yml via GitLocalize 2020-05-04 15:43:28 +00:00
Turret
665779c30b Translate researches_sv.yml via GitLocalize 2020-05-04 15:29:36 +00:00
TheBusyBiscuit
beb03ce8e8
[CI skip] Merge pull request #1858 from TheBusyBiscuit/gitlocalize-11566
Translation 5
2020-05-04 17:08:53 +02:00
SoSeDiK
27e3afe9bd Translate categories_uk.yml via GitLocalize 2020-05-04 15:06:37 +00:00
SoSeDiK
cc36ae9d3a Translate messages_uk.yml via GitLocalize 2020-05-04 15:06:32 +00:00
SoSeDiK
20af50f800 Translate resources_uk.yml via GitLocalize 2020-05-04 15:06:27 +00:00
Turret
3dbd7b03ac Translate messages_sv.yml via GitLocalize 2020-05-04 15:02:12 +00:00
SoSeDiK
87146acdfc Translate messages_ru.yml via GitLocalize 2020-05-04 15:00:37 +00:00
TheBusyBiscuit
18c78a7df2 Translate messages_de.yml via GitLocalize 2020-05-04 14:39:28 +00:00
TheBusyBiscuit
d70dace96f
[CI skip] Merge pull request #1848 from TheBusyBiscuit/gitlocalize-11553
Added korean categories
2020-05-04 16:37:42 +02:00
TheBusyBiscuit
14f06aac02
[CI skip] Merge pull request #1847 from TheBusyBiscuit/gitlocalize-11552
Added korean geo resources
2020-05-04 16:37:28 +02:00
TheBusyBiscuit
113377ceb1 [CI skip] Added 4 new languages 2020-05-04 16:36:07 +02:00
TheBusyBiscuit
0e58c3fa35 Added first Unit Tests 2020-05-04 16:25:47 +02:00
TheBusyBiscuit
3e2d1847ed Little performance improvement 2020-05-03 18:36:29 +02:00
TheBusyBiscuit
cc62bc15f7 [CI skip] Removed duplicate config value 2020-05-02 19:42:52 +02:00
kwonms871
c286f0652e Translate categories_ko.yml via GitLocalize 2020-05-02 17:42:36 +00:00
AOJUCBJD
de388695b7 Translate resources_ko.yml via GitLocalize 2020-05-02 17:33:27 +00:00
kwonms871
3db2154fc9 Translate resources_ko.yml via GitLocalize 2020-05-02 17:33:25 +00:00
András Marczinkó
58d29b427b Translate messages_hu.yml via GitLocalize 2020-05-02 17:28:08 +00:00
TheBusyBiscuit
4131a900e1
Merge pull request #1844 from clementgallois/master
Resolves #1843
2020-05-02 19:13:00 +02:00
TheBusyBiscuit
0c123631d9 [CI skip] Fixed one assignment 2020-05-02 19:10:48 +02:00
TheBusyBiscuit
c6ad95bace
[CI skip] Merge pull request #1673 from TheBusyBiscuit/gitlocalize-11195
Added hebrew categories
2020-05-02 19:10:18 +02:00
TheBusyBiscuit
981c6ab8e8
[CI skip] Merge pull request #1683 from TheBusyBiscuit/gitlocalize-11221
Added indonesian categories
2020-05-02 19:10:03 +02:00
TheBusyBiscuit
0e21ba6b02
[CI skip] Merge pull request #1758 from TheBusyBiscuit/gitlocalize-11274
Added thai categories
2020-05-02 19:09:54 +02:00
TheBusyBiscuit
2c409d1c27
[CI skip] Merge pull request #1766 from TheBusyBiscuit/gitlocalize-11284
Added thai researches
2020-05-02 19:09:44 +02:00
TheBusyBiscuit
343c2dbaf9 [CI skip] Added more translators to the credits 2020-05-02 19:09:28 +02:00
TheBusyBiscuit
b9f22fbe2a [CI skip] Minor changes 2020-05-02 19:07:31 +02:00
TheBusyBiscuit
e69cdff244 [CI skip] Added failsafe for misconfigured addons 2020-05-02 10:40:53 +02:00
clement.gallois@epitech.eu
6cb196898f Fixed typo 2020-05-02 00:18:59 +02:00
clement.gallois@epitech.eu
6ce560bdfe Resolves #1843 2020-05-02 00:01:01 +02:00
TheBusyBiscuit
085d10be0a Maybe resolves #1834 2020-05-01 11:25:42 +02:00
LirCZE
f0e6b85593 Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:32 +00:00
jakmanda05
8ebc23b5c9 Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:31 +00:00
100petr
7bedde4f0c Translate messages_cs.yml via GitLocalize 2020-04-30 19:14:29 +00:00
TheBusyBiscuit
e57e4c8219 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-30 20:51:40 +02:00
TheBusyBiscuit
8cb5579a12 Fixes #1833 2020-04-30 20:51:17 +02:00
Sfiguz7
c7f846640d Translate recipes_it.yml via GitLocalize 2020-04-30 15:26:26 +00:00
Sfiguz7
2922422d88 Translate categories_it.yml via GitLocalize 2020-04-30 15:20:44 +00:00
0XPYEX0
03a293fc40 Translate researches_zh-CN.yml via GitLocalize 2020-04-30 09:17:02 +00:00
TheBusyBiscuit
2b9d109d16 Bandages, Rags and Splints will no longer be consumed if at full health 2020-04-26 16:08:01 +02:00
TheBusyBiscuit
804e450f51 Only retry Mojang lookups if it was rate-limiting 2020-04-26 15:51:12 +02:00
TheBusyBiscuit
ec96e13c82 [CI Skip] Refactoring 2020-04-26 13:50:37 +02:00
TheBusyBiscuit
15b64fc1d5
Revert "Easier to register items" 2020-04-25 23:13:00 +02:00
Daniel Walsh
a3f7c2dc46
Chaining whooo 2020-04-25 21:57:46 +01:00
Daniel Walsh
15b6e3fa31
Easier to register items
Instead of having to do registerResearch(Research, ItemStack...) you can just do new Research(..., items).register()

Makes this more consistent with the other registering too.
2020-04-25 21:28:04 +01:00
TheBusyBiscuit
9eb9a98410 Fixes #1824 2020-04-25 19:14:50 +02:00
TheBusyBiscuit
f18cb33eef [CI skip] Reduced technical debt 2020-04-25 13:01:32 +02:00
TheBusyBiscuit
45ed89c6f5 Bugged Generators from Addons will no longer destroy Energy Regulators 2020-04-25 02:16:21 +02:00
TheBusyBiscuit
d896462c2d Fixed Emergency Transmitters + Reduced technical debt 2020-04-23 18:08:15 +02:00
TheBusyBiscuit
a04676b27c Various improvements, including Pull Request #1790 2020-04-23 13:01:47 +02:00
DNx5
5cf0487cb7 Moved the tick delay value into static constant 2020-04-22 07:54:34 +07:00
DNx5
034ff1948a missed a spot 2020-04-22 06:32:53 +07:00
DNx5
81add1caa2 code cleanup 2020-04-22 06:18:42 +07:00
DNx5
2a22eebd8a Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
 Conflicts:
	pom.xml
2020-04-22 06:16:35 +07:00
DNx5
92e8aa955b - Get the tick delay value directly in method
- Added comment to explain how the skipping ticks work
2020-04-22 06:16:03 +07:00
TheBusyBiscuit
ca6170e64b Fixes #1490 2020-04-21 21:07:05 +02:00
TheBusyBiscuit
1baefd37b0 Updated dependency 2020-04-21 20:28:26 +02:00
TheBusyBiscuit
9aa6fa68ca [CI skip] Reduced technical debt 2020-04-21 20:25:46 +02:00
TheBusyBiscuit
485cde8c90 Added stronger state preservation to the BlockMenuPreset class 2020-04-21 20:25:33 +02:00
TheBusyBiscuit
b013247ea2 Fixes #1798 2020-04-21 01:48:22 +02:00
DNx5
70b5a5a9d1 code cleanup 2020-04-20 15:49:17 +07:00
DNx5
0784077821 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNet.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
2020-04-20 15:32:45 +07:00
TheBusyBiscuit
d5eb1eddae [CI skip] Fixed javadocs 2020-04-19 13:23:20 +02:00
TheBusyBiscuit
61b4a1fe1a /sf teleporter will now open your own teleporter if no player was given 2020-04-19 13:18:33 +02:00
TheBusyBiscuit
16e2376604 Fixes #893 2020-04-19 13:06:58 +02:00
TheBusyBiscuit
a6a061588c Performance optimizations for large addons like ColoredEnderChests 2020-04-18 18:28:20 +02:00
TheBusyBiscuit
cbf7251dcd Added a few more Item Settings 2020-04-18 00:11:57 +02:00
TheBusyBiscuit
1957bee667 Refactored Talismans 2020-04-17 22:33:13 +02:00
TheBusyBiscuit
79867d79cf [CI skip] Some refactoring 2020-04-17 22:01:09 +02:00
TheBusyBiscuit
c007611cae Geo Scans are now paginated 2020-04-17 22:00:35 +02:00
TheBusyBiscuit
8c0c2e6c95 The Composter now also supports the Output Chest 2020-04-17 22:00:07 +02:00
Panda.com
5cf0d6d061 changed requested changes 2020-04-17 19:11:13 +02:00
Panda.com
fbdf934045 Change Automated ignition chambers recipe 2020-04-17 19:04:13 +02:00
TheBusyBiscuit
eead20cb7e Fixes #1814 2020-04-17 14:59:49 +02:00
TheBusyBiscuit
1dd8cd20d9 [CI skip] Refactoring 2020-04-17 14:14:24 +02:00
TheBusyBiscuit
a7c3ca1ab1
Merge pull request #1812 from Liruxo/master
Changed Inventory opening behaviour
2020-04-17 12:00:00 +02:00
TheBusyBiscuit
882d28cabe Fixed #1813 2020-04-17 11:59:40 +02:00
Liruxo
1cf461f986
Changed Inventory opening behaviour 2020-04-16 12:00:48 +02:00
TheBusyBiscuit
f5022ca790 [CI skip] Refactoring and deprecation 2020-04-15 17:52:15 +02:00
TheBusyBiscuit
76b8204bd0 [CI skip] You can no longer /sf give yourself a Multiblock 2020-04-14 23:50:12 +02:00
TheBusyBiscuit
5115175d7f Fixes #1807 2020-04-13 20:08:05 +02:00
TheBusyBiscuit
6dd02aaf6a Fixes #1806 2020-04-13 17:40:09 +02:00
DNx
f505d6f740 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
 Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java
2020-04-13 20:22:15 +07:00
DNx
e985698f9f Implement cargo network tick delay 2020-04-13 20:19:41 +07:00
TheBusyBiscuit
5842598f8e Fixes #1803 2020-04-12 23:25:52 +02:00
TheBusyBiscuit
2ebd003f3a Finalized new and improved Item Settings API 2020-04-12 12:57:35 +02:00
TheBusyBiscuit
15ed598552 [CI skip] Various fixes and documentation [javadocs] 2020-04-12 12:15:05 +02:00
TheBusyBiscuit
0c96323de9
[CI skip] Merge pull request #1800 from TweepCoding/master
AncientAltarOutputEvent added
2020-04-12 00:31:05 +02:00
TweepCoding
666c9a2a31 Adding Fixes Part... you get the point 2020-04-11 17:29:31 -05:00
TweepCoding
79737886ac Adding Fixes Part 3: I dont know what to put here 2020-04-11 17:23:07 -05:00
TweepCoding
fb9e0f1ab8 Adding Fixes Part 2: Electric Bungaloo 2020-04-11 11:37:57 -05:00
TweepCoding
7a798b0bc8 Adding Fixes 2020-04-11 09:08:36 -05:00
TheBusyBiscuit
46ff8b076d [CI skip] Removed Java 1.9 only stuff... 2020-04-11 15:07:24 +02:00
TheBusyBiscuit
8cb99fd7ae [CI skip] More refactoring, more documentation [javadocs] 2020-04-11 14:38:28 +02:00
TweepCoding
332a017c63 Adding Extra Method 2020-04-10 23:21:40 -05:00
TweepCoding
9c6c80da6c Adding Extra Method 2020-04-10 23:00:44 -05:00
SlimeyDerp
b7929dfebf Adding Altar Output Event 2020-04-10 22:49:30 -05:00
DNx
ec6698602c optimize Cargo Node's filter index saving. 2020-04-11 05:32:18 +07:00
DNx
ebd8974155 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-11 04:18:27 +07:00
TheBusyBiscuit
65116afbe7 [CI skip] Refactoring and documentation [javadocs] 2020-04-10 20:30:24 +02:00
DNx
2233a0314d added leftover changes, and bug fixes.
with possibility of bringing more bugs
2020-04-10 13:59:50 +07:00
DNx
e4a5e78cc6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4
 Conflicts:
	pom.xml
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/OreCrusher.java
2020-04-10 08:08:27 +07:00
DNx
c00fb1dc1b simplify cargo withdraw methods.
trying to reduce unnecessary item clone as much as possible.
2020-04-10 08:05:17 +07:00
DNx
88a5129b1a Move BlockUtils into cargo package. removed ender chest from the list. use slimefun's method to check minecraft version 2020-04-10 07:22:32 +07:00
DNx
4cc2e8c4d2 Fix OreCrusher, add recipes on post-register 2020-04-10 07:04:24 +07:00
DNx
75564fc7f1 fix OreCrusher item registration 2020-04-10 04:41:10 +07:00
DNx
fa8c07884c fix 1.13 compatibility 2020-04-10 04:40:38 +07:00
TheBusyBiscuit
e3d84de7b9 [CI skip] Refactoring 2020-04-09 22:16:32 +02:00
DNx
9eb3ee2d53 Simplify and optimize the Cargo insertion 2020-04-10 03:12:30 +07:00
DNx
aeab78b174 simplify the shulker boxes check 2020-04-10 02:20:54 +07:00
TheBusyBiscuit
f5bd880227 [Ci skip] Forgot to delete this class 2020-04-09 14:31:02 +02:00
TheBusyBiscuit
911f8aeceb [CI skip] More refactoring and overall API improvements 2020-04-09 14:22:30 +02:00
TheBusyBiscuit
8f698bebee [CI skip] Reduced technical debt 2020-04-09 03:18:14 +02:00
TheBusyBiscuit
0e6af8e0a1 [CI skip] A bunch of improvements [javadocs] 2020-04-09 02:21:30 +02:00
TheBusyBiscuit
d03cb64c02 Removed /sf elevator 2020-04-08 20:33:10 +02:00
TheBusyBiscuit
ab31180050 [CI skip] Added a new exception [javadocs] 2020-04-08 15:49:44 +02:00
TheBusyBiscuit
a77c9c3dad [CI skip] Forgot a character [javadocs] 2020-04-07 19:38:00 +02:00
TheBusyBiscuit
df06dde53e [CI skip] Some minor changes [javadocs] 2020-04-07 19:01:30 +02:00
TheBusyBiscuit
be50bc9128
[CI skip] Merge pull request #1795 from TheBusyBiscuit/gitlocalize-11370
Turkish translation update Pt. 2: Researches
2020-04-07 18:34:12 +02:00
LinoxGH
3c272fb76b Translate researches_tr.yml via GitLocalize 2020-04-07 15:41:43 +00:00
LinoxGH
b23555181f Translate recipes_tr.yml via GitLocalize 2020-04-07 15:41:00 +00:00
TheBusyBiscuit
afd978b2ad [CI skip] More refactoring [javadocs] 2020-04-07 01:01:13 +02:00
TheBusyBiscuit
82bd45a960 [CI skip] More work on the book 2020-04-05 20:54:28 +02:00
DNx
9461447410 split shulker boxes check 2020-04-05 23:30:19 +07:00
DNx
2396db25ad code cleanup 2020-04-05 23:25:10 +07:00
TheBusyBiscuit
8011956459 [CI skip] Added /sf search suggestion to the book interface 2020-04-05 18:02:45 +02:00
TheBusyBiscuit
af4de4fd10 [CI skip] WIP Refactoring 2020-04-05 17:35:50 +02:00
DNx
ab41129d6b Cargo - small performance improvements 2020-04-05 09:26:46 +07:00
DNx
e07c2f5263 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-05 09:12:07 +07:00
TheBusyBiscuit
f65563b28c [CI skip] More refactoring 2020-04-04 20:55:28 +02:00
TheBusyBiscuit
b96fd1d4dc [CI skip] Fixed javadocs [javadocs] 2020-04-04 15:20:34 +02:00
TheBusyBiscuit
007a4c6f83 [CI skip] More refactoring and documentation [javadocs] 2020-04-04 15:16:11 +02:00
DNx
6d9bd2ccf2 Cargo - small performance improvements 2020-04-04 12:20:56 +07:00
TheBusyBiscuit
f8765ea84e [CI skip] Building javadocs [javadocs] 2020-04-04 03:29:13 +02:00
TheBusyBiscuit
b3cc976ac3 Added ItemSetting API [javadocs] 2020-04-04 03:24:49 +02:00
TheBusyBiscuit
b01b980d2f Refactoring and more error contexts 2020-04-04 02:45:51 +02:00
TheBusyBiscuit
ab3c0eb945 [CI skip] Fixed javadocs [javadocs] 2020-04-03 12:17:30 +02:00
TheBusyBiscuit
f054d83130 [CI skip] Generate javadocs [javadocs] 2020-04-03 12:10:42 +02:00
TheBusyBiscuit
156683f318 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-04-03 11:42:12 +02:00
TheBusyBiscuit
44ab15811a Fixes #1779 and some other changes 2020-04-03 11:41:58 +02:00
András Marczinkó
56cfc8042e Translate recipes_hu.yml via GitLocalize 2020-03-31 15:42:21 +00:00
Nameless
049131b045 Translate recipes_zh-CN.yml via GitLocalize 2020-03-31 06:09:43 +00:00
bito-blosh
2c9d327aac Translate recipes_ja.yml via GitLocalize 2020-03-30 17:18:28 +00:00
bito-blosh
66b0ac721b Translate recipes_ja.yml via GitLocalize 2020-03-30 16:55:43 +00:00
TheBusyBiscuit
404f5ca653
Merge pull request #1776 from TheBusyBiscuit/gitlocalize-11295
recipes_es
2020-03-30 18:53:01 +02:00
TheBusyBiscuit
7944c44c43 Fixed a small bug 2020-03-30 18:50:55 +02:00
TheBusyBiscuit
107483d64f [CI skip] Finally... [javadocs] 2020-03-30 18:47:24 +02:00
TheBusyBiscuit
2c0f486b94 [CI skip] Forgot to add [javadocs] to the commit name... 2020-03-30 18:44:18 +02:00
TheBusyBiscuit
ad6dfb676c [CI skip] Some API changes 2020-03-30 18:43:24 +02:00
Vravinite
8a470b628f Translate recipes_es.yml via GitLocalize 2020-03-30 16:34:16 +00:00
TheBusyBiscuit
8e712335fc
[CI skip] Merge pull request #1773 from TheBusyBiscuit/gitlocalize-11291
Updated chinese (TW) recipes
2020-03-30 15:40:46 +02:00
TheBusyBiscuit
61f8959688 Translate messages_zh-TW.yml via GitLocalize 2020-03-30 13:40:06 +00:00
HeroBrineKing
d0f976d1fe Translate recipes_zh-TW.yml via GitLocalize 2020-03-30 13:38:38 +00:00
KillerXCoder
5251df4fea Translate recipes_sk.yml via GitLocalize 2020-03-30 12:47:02 +00:00
TheBusyBiscuit
7a4ae31dcf Translate recipes_de.yml via GitLocalize 2020-03-30 12:07:11 +00:00
TheBusyBiscuit
6d12b23fc1 [CI skip] Added remaining recipe translation keys 2020-03-30 13:58:36 +02:00
TheBusyBiscuit
d763a38308 [CI skip] Added Guide Options API 2020-03-29 18:57:43 +02:00
TheBusyBiscuit
a449b62dba [CI skip] Added an API for Guide Options 2020-03-29 18:54:46 +02:00
TheBusyBiscuit
03a42ab946 [CI skip] Fixed javadocs [javadocs] 2020-03-28 21:14:31 +01:00
TheBusyBiscuit
c5793405ee [CI skip] Rebuild javadocs [javadocs] 2020-03-28 21:04:16 +01:00
TheBusyBiscuit
ebe686d458 [CI skip] Prevent non-dependents from becoming addons 2020-03-28 21:02:36 +01:00
TheBusyBiscuit
04345735df [CI skip] Added new exception that prevents Addons from doing dumb stuff 2020-03-28 15:47:01 +01:00
TheBusyBiscuit
43cbdf25e9 [CI skip] Removed deprecated intefaces 2020-03-28 12:50:17 +01:00
TheBusyBiscuit
83685533f9 Filing a new release 2020-03-28 12:12:26 +01:00
TheBusyBiscuit
e6100a20df [Ci skip] Refactoring 2020-03-27 13:19:47 +01:00
TheBusyBiscuit
03d1bd709d [CI skip] Refactoring 2020-03-27 12:16:42 +01:00
TheBusyBiscuit
1cd84ff17a [Ci skip] Added a small failsafe 2020-03-27 08:39:27 +01:00
TheBusyBiscuit
de9039e6db [CI skip] Refactoring 2020-03-27 01:55:11 +01:00
TheBusyBiscuit
d78e8fa44c [CI skip] Include EmeraldEnchants integration now properly 2020-03-27 01:21:48 +01:00
TheBusyBiscuit
35f45df852 [CI skip] Moved Cargo network classes 2020-03-27 00:31:12 +01:00
TheBusyBiscuit
6553dfce6e Fixes #1768 2020-03-27 00:30:05 +01:00
TheBusyBiscuit
724810bb4a :dumb cookie facepalm emote: 2020-03-26 19:04:44 +01:00
TheBusyBiscuit
6cd3b1baea Quick fix 2020-03-26 19:03:45 +01:00
TheBusyBiscuit
f2c7964dc6 Refactored some things 2020-03-26 18:59:28 +01:00
TheBusyBiscuit
3e90349551 Refactored some things 2020-03-26 18:56:14 +01:00
film2860
01f290d415 Translate researches_th.yml via GitLocalize 2020-03-25 14:49:32 +00:00
TheBusyBiscuit
fb88ad65e5
[CI skip] Merge pull request #1762 from SlimeyDerp/gold_update2
New pull request: 4K Gold able to be used for crafting
2020-03-24 17:32:21 +01:00
Sfiguz7
7acb093474 Translate recipes_it.yml via GitLocalize 2020-03-24 15:54:22 +00:00
Nicolas Saavedra gonzalez
52e6f39d77 Removed lore changes 2020-03-24 07:54:46 -05:00
Nicolas Saavedra gonzalez
49afe21f15 .DS_Store banished! 2020-03-24 00:32:03 -05:00
Nicolas Saavedra gonzalez
19dd69ffdc Upload 2020-03-24 00:08:55 -05:00
TheBusyBiscuit
f8d17472f2 [CI skip] Very small improvements to cargo networks 2020-03-24 02:00:21 +01:00
TheBusyBiscuit
7458aa5bb8 [CI skip] Refactoring and updated documentation [javadocs] 2020-03-23 16:52:51 +01:00
phoomin2012
93c5023bff Translate categories_th.yml via GitLocalize 2020-03-23 03:21:23 +00:00
TheBusyBiscuit
2c290c9601 [CI skip] A little refactoring 2020-03-23 04:21:06 +01:00
TheBusyBiscuit
6d40852afc [CI skip] Refactoring and documentation [javadocs] 2020-03-22 16:45:57 +01:00
TheBusyBiscuit
0babf64d62 [CI skip] Refactoring and documentation [javadocs] 2020-03-22 16:44:28 +01:00
TheBusyBiscuit
2a0c3ff93c [CI skip] Added some package documentations [javadocs] 2020-03-21 21:17:21 +01:00
TheBusyBiscuit
6ea5440c60 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-03-21 21:16:37 +01:00
TheBusyBiscuit
dd29abf24a [CI skip] Added package docs [javadocs] 2020-03-21 21:16:25 +01:00
TheBusyBiscuit
a83ad6a94e
[CI skip] Merge pull request #1751 from TheBusyBiscuit/gitlocalize-11269
Updated Russian researches
2020-03-21 20:55:56 +01:00
TheBusyBiscuit
9ac325adbc [CI skip] Updated translators 2020-03-21 20:55:42 +01:00