mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
4,267 Commits 1 Branch 0 Tags 64 MiB
d8d4811974
Commit Graph

3258 Commits

Author SHA1 Message Date
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
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
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
f233657fbd Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into feature/profiler 2020-07-02 12:51:55 +02:00
TheBusyBiscuit
b978a8def3 Another small fix 2020-07-02 11:57:11 +02: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
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
TheBusyBiscuit
c63f4bf8af
Merge pull request #2057 from LinoxGH/HazmatSuitBees 
Added Bee Protection to Hazmat Suit.
 2020-06-28 17:12:10 +02: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
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
492010a8d4 Adjusted Unit Test to include new item tags 2020-06-27 14:32:13 +02: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
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
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
TheBusyBiscuit
80fc0a173e Added lore addition 2020-06-26 20:58:23 +02:00
TheBusyBiscuit
f99c727583 Added another Unit Test 2020-06-26 20:37:53 +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
TheBusyBiscuit
ca6a7ebcc3
[CI skip] Merge pull request #2023 from TheBusyBiscuit/gitlocalize-12201 
Translate added section in researches into Japanese.
 2020-06-25 02:34:15 +02:00
TheBusyBiscuit
bc4b625172 [CI skip] Added two unit tests for translation file integrity 2020-06-25 02:33:26 +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
d18cb3a898 Adjusted Unit Tests to new behaviour 2020-06-20 21:45:24 +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
913ce0777b Added wiki.json Unit Test 2020-06-15 13:29:02 +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
0a6e00fae5 Deleted a faulty Unit Test 2020-06-13 22:16:06 +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
TheBusyBiscuit
c915b3375b [Ci skip] Updated MockBukkit 2020-06-13 21:05:55 +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
08bc0c4aac Added another Unit Test 2020-06-12 19:15:11 +02:00
TheBusyBiscuit
bc6fe019bf Added a template for SlimefunItem Unit Tests 2020-06-12 18:55:35 +02:00
TheBusyBiscuit
8bd653a1b5 Added Unit Tests for the Cooler Listener 2020-06-12 18:55:22 +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