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
3,068 Commits 1 Branch 0 Tags 64 MiB
e95c5939a3
Commit Graph

2345 Commits

Author SHA1 Message Date
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
TheBusyBiscuit
b657e2fce5 Translate messages_ru.yml via GitLocalize 2020-03-21 17:17:00 +00:00
Alexander Zhukov
f77282a1c3 Translate researches_ru.yml via GitLocalize 2020-03-21 17:16:46 +00:00
TheBusyBiscuit
2f70eaf8d4 [CI skip] Fixed javadocs annotations 2020-03-21 17:40:35 +01:00
TheBusyBiscuit
bfcbda1030
Merge pull request #1722 from StarWishsama/patch-3 
Fixed #1721
 2020-03-20 11:37:54 +01:00
TheBusyBiscuit
777b54e696 Fixed Android Fuel Interfaces 2020-03-20 11:37:37 +01:00
Nameless
847c545d07
Fixed #1721 2020-03-20 15:12:26 +08:00
TheBusyBiscuit
84dbea4473 Improved Slimefun Guide History, it now remembers category pages 2020-03-19 20:38:13 +01:00
TheBusyBiscuit
afac5cc0ce Fixes #1719 2020-03-19 13:14:29 +01:00
TheBusyBiscuit
4744fbac56 [CI skip] Refactoring 2020-03-18 15:52:36 +01:00
TheBusyBiscuit
3cd31e2c2f Some minor improvements 2020-03-18 14:20:49 +01:00
TheBusyBiscuit
c0d67fb3f2
[CI skip] Merge pull request #1718 from TheBusyBiscuit/gitlocalize-11247 
Added italian resources
 2020-03-18 14:20:07 +01:00
Sfiguz7
6e5c8ff113 Translate resources_it.yml via GitLocalize 2020-03-18 13:18:39 +00:00
Sfiguz7
97673e1f7b Translate messages_it.yml via GitLocalize 2020-03-18 13:16:26 +00:00
xXDOTTORXx
b7f926a552 Translate messages_it.yml via GitLocalize 2020-03-18 13:16:24 +00:00
Dams_
9473722498 Translate researches_fr.yml via GitLocalize 2020-03-17 18:03:31 +00:00
Pierre
f0729ccce7 Translate researches_fr.yml via GitLocalize 2020-03-17 18:03:30 +00:00
TheBusyBiscuit
2de6c9d249 Fixed #1711 2020-03-17 16:46:08 +01:00
TheBusyBiscuit
1afb9e17f6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-03-17 16:46:00 +01:00
TheBusyBiscuit
bd09ea0d9d Fixed #1710 2020-03-17 16:45:13 +01:00
Nameless
2c192dbbdc Translate researches_zh-CN.yml via GitLocalize 2020-03-17 00:48:14 +00:00
TheBusyBiscuit
32a922ec7f Fixes #1706 2020-03-17 00:43:57 +01:00
TheBusyBiscuit
0e3c24ef1a
[CI skip] Merge pull request #1705 from TheBusyBiscuit/gitlocalize-11240 
Slovak language - researches
 2020-03-17 00:33:40 +01:00
KillerXCoder
659c321d04 Translate researches_sk.yml via GitLocalize 2020-03-16 22:07:18 +00:00
TheBusyBiscuit
cdd548aa06 Translate messages_sk.yml via GitLocalize 2020-03-16 22:06:53 +00:00
TheBusyBiscuit
c45fe146f6 Firework from researching no longer deals damage 2020-03-16 19:06:51 +01:00
HeroBrineKing
d12a0a7a60 Translate messages_zh-TW.yml via GitLocalize 2020-03-16 13:24:40 +00:00
bito-blosh
1c8d139437 Translate researches_ja.yml via GitLocalize 2020-03-16 11:29:17 +00:00
András Marczinkó
e11ee9cabe Translate researches_hu.yml via GitLocalize 2020-03-16 11:00:12 +00:00
TheBusyBiscuit
19609edf53
[CI skip] Merge pull request #1698 from TheBusyBiscuit/gitlocalize-11232 
researches_es
 2020-03-16 02:37:34 +01:00
Luu7
277e3e8772 Translate messages_es.yml via GitLocalize 2020-03-16 01:31:32 +00:00
Vravinite
08c1665906 Translate researches_es.yml via GitLocalize 2020-03-16 01:29:45 +00:00
TheBusyBiscuit
0c5ef6fc83 Added Makeshift Smeltery + Tree Growth Accelerator 2020-03-16 02:18:35 +01:00
TheBusyBiscuit
fef2a4ae2d Added Makeshift Smeltery 2020-03-16 01:57:37 +01:00
TheBusyBiscuit
3c70941514 Added RecipeChoiceTask to Multiblocks 2020-03-16 01:57:20 +01:00
TheBusyBiscuit
58ad9e3749 Updated bStats charts 2020-03-15 17:52:12 +01:00
TheBusyBiscuit
ca26368847 [CI skip] Refactoring 2020-03-15 17:43:51 +01:00
TheBusyBiscuit
62a087b16a
[CI skip] Merge pull request #1695 from TheBusyBiscuit/gitlocalize-11229 
Added some messages
 2020-03-15 15:13:15 +01:00
TheBusyBiscuit
6cfd39c0d2
[CI skip] Merge pull request #1697 from TheBusyBiscuit/gitlocalize-11231 
Changed machines names back to English
 2020-03-15 15:13:01 +01:00
TheBusyBiscuit
5c1e949c2a [CI skip] Reduced technical debt 2020-03-15 15:12:44 +01:00
Just Mango
ded5b4298f Translate recipes_vi.yml via GitLocalize 2020-03-15 14:08:02 +00:00
justsiro
51b32c6a1f Translate recipes_vi.yml via GitLocalize 2020-03-15 14:08:00 +00:00
JustAPieOP
78fac0bf40 Translate recipes_vi.yml via GitLocalize 2020-03-15 14:07:58 +00:00
nahkd123
14808dcc8a Translate recipes_vi.yml via GitLocalize 2020-03-15 14:07:57 +00:00
nahkd123
b358326512 Translate messages_vi.yml via GitLocalize 2020-03-15 13:25:54 +00:00
TheBusyBiscuit
8502c42128 Fixed #1397 2020-03-15 13:41:44 +01:00
TheBusyBiscuit
46003a1026 Fixed #1648 2020-03-15 13:16:49 +01:00
TheBusyBiscuit
2e3a7f3a9b [CI skip] Refactoring 2020-03-15 13:16:24 +01:00
TheBusyBiscuit
910cb93955 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-03-14 01:13:08 +01:00
TheBusyBiscuit
4bcccd3872 Fixes #1686 2020-03-14 01:12:52 +01:00
András Marczinkó
b74e474214
Fixed recipes Hungarian translation 2020-03-13 23:12:54 +01:00
TheBusyBiscuit
ccca9300c2
[CI skip] Merge pull request #1685 from TheBusyBiscuit/gitlocalize-11225 
Updated hungarian
 2020-03-13 16:01:40 +01:00
TheBusyBiscuit
be836145ea [CI skip] Little change 2020-03-13 16:00:35 +01:00
András Marczinkó
dd9347459c Translate messages_hu.yml via GitLocalize 2020-03-13 15:00:28 +00:00
TheBusyBiscuit
f0e29fc767 [CI skip] Refactoring, also updated README 2020-03-13 01:52:57 +01:00
András Marczinkó
6cc30916c0 Translate recipes_hu.yml via GitLocalize 2020-03-12 23:14:16 +00:00
diradho
0ace472f61 Translate categories_id.yml via GitLocalize 2020-03-12 19:56:16 +00:00
TheBusyBiscuit
e893e179ea Fixes #1570 2020-03-12 03:32:28 +01:00
TheBusyBiscuit
6ccba72668 [CI skip] Refactoring 2020-03-12 03:32:04 +01:00
TheBusyBiscuit
bacf094410
[CI skip] Merge pull request #1682 from TheBusyBiscuit/gitlocalize-11212 
Update recipes_zh-CN.yml
 2020-03-12 03:23:32 +01:00