mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 20:25:54 +00:00
Code Releases Activity
5,018 Commits 1 Branch 0 Tags 64 MiB
4a53e82414
Commit Graph

2550 Commits

Author SHA1 Message Date
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
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
Nameless
bb9f22e01b Translate recipes_zh-CN.yml via GitLocalize 2020-03-12 01:58:24 +00:00
Nameless
0a3a125239 Translate messages_zh-CN.yml via GitLocalize 2020-03-12 01:58:00 +00:00
TheBusyBiscuit
09563d5fa4
[CI skip] Merge pull request #1674 from TheBusyBiscuit/gitlocalize-11197 
messages_es
 2020-03-12 00:10:05 +01:00
TheBusyBiscuit
16d314ae7b
[CI skip] Merge pull request #1676 from TheBusyBiscuit/gitlocalize-11199 
recipes_es
 2020-03-12 00:09:34 +01:00
TheBusyBiscuit
c2d1a08eb5
[CI skip] Merge pull request #1675 from TheBusyBiscuit/gitlocalize-11198 
Categories_es
 2020-03-12 00:09:07 +01:00
TheBusyBiscuit
ca65b115b1
[CI skip] Merge pull request #1677 from TheBusyBiscuit/gitlocalize-11200 
resources_es
 2020-03-12 00:08:44 +01:00
Edwin Kerforne
0739272178 Translate messages_fr.yml via GitLocalize 2020-03-11 22:50:15 +00:00
Dams_
dd84eb77e2 Translate messages_fr.yml via GitLocalize 2020-03-11 22:50:14 +00:00
Pierre
e708cd91c2 Translate messages_fr.yml via GitLocalize 2020-03-11 22:50:13 +00:00
Vravinite
59d7d79b96 Translate resources_es.yml via GitLocalize 2020-03-11 22:32:45 +00:00
Vravinite
df29485d8d Translate recipes_es.yml via GitLocalize 2020-03-11 22:32:06 +00:00
Vravinite
928e0f3e2f Translate categories_es.yml via GitLocalize 2020-03-11 22:29:59 +00:00
Luu7
270695e807 Translate messages_es.yml via GitLocalize 2020-03-11 22:29:17 +00:00
Vravinite
bd61c437bf Translate messages_es.yml via GitLocalize 2020-03-11 22:29:16 +00:00
dhtdht020
ea2232409b Translate categories_he.yml via GitLocalize 2020-03-11 19:14:03 +00:00
TheBusyBiscuit
92d030ca3b
[CI skip] Merge pull request #1672 from TheBusyBiscuit/gitlocalize-11193 
Translation to Turkish of Recipes is updated
 2020-03-11 18:00:07 +01:00
LinoxGH
7ccabd8ca6 Translate recipes_tr.yml via GitLocalize 2020-03-11 15:28:20 +00:00
LinoxGH
797ffa30b3 Translate messages_tr.yml via GitLocalize 2020-03-11 15:27:39 +00:00
TheBusyBiscuit
2fa9b46f89
[CI skip] Merge pull request #1667 from WalshyDev/patch-4 
Add getItem() to SlimefunItemStack
 2020-03-11 03:27:28 +01:00
TheBusyBiscuit
87f693a1ca
[CI skip] Merge pull request #1668 from TheBusyBiscuit/gitlocalize-11173 
Update messages_vi.yml
 2020-03-11 03:25:37 +01:00
TheBusyBiscuit
29fb2a917d
[CI skip] Merge pull request #1663 from TheBusyBiscuit/gitlocalize-11168 
researches_es
 2020-03-11 03:21:59 +01:00
TheBusyBiscuit
087fa918b5
[CI skip] Merge pull request #1660 from TheBusyBiscuit/gitlocalize-11165 
messages_es
 2020-03-11 03:21:07 +01:00
Daniel Walsh
4c1953ef60
Link SlimefunItemStack 2020-03-11 02:13:58 +00:00
Daniel Walsh
865ff25d4c
(By the way, you know this breaks convention) 2020-03-11 02:10:57 +00:00
nahkd123
a99931e60e Translate messages_vi.yml via GitLocalize 2020-03-11 02:10:16 +00:00
Daniel Walsh
c1aa385fae
Import 2020-03-11 02:06:22 +00:00
Daniel Walsh
1eeeaba3a4
Add getItem() 2020-03-11 01:53:59 +00:00
Muhammad Kamal Fergany
8aa1319afd Translate messages_ar.yml via GitLocalize 2020-03-10 23:32:07 +00:00
Luu7
a1989bdac5 Translate researches_es.yml via GitLocalize 2020-03-10 22:08:03 +00:00
dbzjjoe
fa67d29ffc Translate researches_es.yml via GitLocalize 2020-03-10 22:08:02 +00:00
Vravinite
3264c6e0bd Translate researches_es.yml via GitLocalize 2020-03-10 22:08:01 +00:00
Pierre
c4797e835a Translate messages_fr.yml via GitLocalize 2020-03-10 21:50:40 +00:00
Luu7
8e616bfb3a Translate messages_es.yml via GitLocalize 2020-03-10 21:48:26 +00:00
TheBusyBiscuit
364d9cb4d1
[CI skip] Merge pull request #1659 from TheBusyBiscuit/gitlocalize-11164 
Updated Russian messages
 2020-03-10 22:46:54 +01:00
SoSeDiK
2adeea3b08 Translate messages_ru.yml via GitLocalize 2020-03-10 21:45:15 +00:00
bito-blosh
129634bd34 Translate recipes_ja.yml via GitLocalize 2020-03-10 21:39:59 +00:00
bito-blosh
b2d6761e95 Translate messages_ja.yml via GitLocalize 2020-03-10 21:33:46 +00:00
TheBusyBiscuit
5f73b78943
[CI skip] Merge pull request #1655 from TheBusyBiscuit/gitlocalize-11160 
Slovak language
 2020-03-10 22:30:40 +01:00
TheBusyBiscuit
b262c7f9ff
[CI skip] Merge pull request #1656 from TheBusyBiscuit/gitlocalize-11161 
Slovak language  - messages
 2020-03-10 22:29:34 +01:00
TheBusyBiscuit
d68c019396 [Ci skip] Little tweak 2020-03-10 22:28:17 +01:00
KillerXCoder
0066e3b253 Translate messages_sk.yml via GitLocalize 2020-03-10 21:28:17 +00:00
KillerXCoder
adc263c431 Translate recipes_sk.yml via GitLocalize 2020-03-10 21:27:18 +00:00
TheBusyBiscuit
08277133aa
[CI skip] Merge pull request #1654 from TheBusyBiscuit/gitlocalize-11159 
Updated german recipe types
 2020-03-10 22:27:08 +01:00
TheBusyBiscuit
2901183006 Translate recipes_de.yml via GitLocalize 2020-03-10 21:26:20 +00:00
TheBusyBiscuit
2a02ff96cb Translate messages_de.yml via GitLocalize 2020-03-10 21:24:26 +00:00
TheBusyBiscuit
3234e2b86a [CI skip] Manually causing an update so gitlocalize wakes up... 2020-03-10 22:21:50 +01:00
TheBusyBiscuit
a589c75aa9 [CI skip] Updating translations (test?) 2020-03-10 22:19:53 +01:00
TheBusyBiscuit
952d2592b7 [CI skip] Updated language files 2020-03-10 22:09:19 +01:00
TheBusyBiscuit
eb6140c7ed [CI skip] Added new recipe type translations 2020-03-10 21:44:42 +01:00
TheBusyBiscuit
242aba9352 [CI skip] Refactoring 2020-03-10 21:44:24 +01:00
TheBusyBiscuit
e486ab152b [CI skip] Refactoring 2020-03-10 15:20:59 +01:00
TheBusyBiscuit
aa1f505141 [CI skip] Refactoring 2020-03-10 01:49:55 +01:00
bito-blosh
f02a7b89c6 Translate recipes_ja.yml via GitLocalize 2020-03-09 12:56:22 +00:00
TheBusyBiscuit
e4b00920d2 [CI skip] Reduced technical debt 2020-03-08 18:27:32 +01:00
TheBusyBiscuit
7f12521b00 Significantly increased the teleporter speed 2020-03-08 17:43:56 +01:00
Yunus Kemal
6e155fd7f2 Translate recipes_tr.yml via GitLocalize 2020-03-07 17:27:46 +00:00
LinoxGH
7ffe444048 Translate recipes_tr.yml via GitLocalize 2020-03-07 17:27:44 +00:00
TheBusyBiscuit
eed8cb4e71
Merge pull request #1641 from TheBusyBiscuit/gitlocalize-11132 
Translation to Turkish of Messages is done
 2020-03-07 17:27:24 +01:00
TheBusyBiscuit
3ea6d0d16b [CI skip] Updated translators list 2020-03-07 17:26:16 +01:00
TheBusyBiscuit
fefbf37839
[CI skip] Merge pull request #1640 from TheBusyBiscuit/gitlocalize-11131 
Translation to Turkish of Categories is done
 2020-03-07 17:25:41 +01:00
TheBusyBiscuit
40b1a53708
[CI skip] Merge pull request #1643 from TheBusyBiscuit/gitlocalize-11134 
Translation to Turkish of Researches is done
 2020-03-07 17:24:25 +01:00
TheBusyBiscuit
55f11de0fa
[CI skip] Merge pull request #1644 from TheBusyBiscuit/gitlocalize-11135 
Translation to Turkish of Resources is done
 2020-03-07 17:24:03 +01:00
TheBusyBiscuit
7f6686db32
[CI skip] Merge pull request #1637 from TheBusyBiscuit/gitlocalize-11128 
Undo translations of Slimefun Machines
 2020-03-07 17:20:42 +01:00
LinoxGH
a06ba21440 Translate resources_tr.yml via GitLocalize 2020-03-07 15:49:08 +00:00
Yunus Kemal
e6ddd0410a Translate resources_tr.yml via GitLocalize 2020-03-07 15:49:06 +00:00
machine-translation
a87ba59469 Translate researches_tr.yml via GitLocalize 2020-03-07 15:48:43 +00:00
Yunus Kemal
c244d47393 Translate researches_tr.yml via GitLocalize 2020-03-07 15:48:41 +00:00
LinoxGH
e07ad49feb Translate researches_tr.yml via GitLocalize 2020-03-07 15:48:39 +00:00
Yunus Kemal
26c6b74d1f Translate messages_tr.yml via GitLocalize 2020-03-07 15:47:21 +00:00
LinoxGH
9f9752c36b Translate messages_tr.yml via GitLocalize 2020-03-07 15:47:19 +00:00
LinoxGH
5a284b29b4 Translate categories_tr.yml via GitLocalize 2020-03-07 15:37:21 +00:00
Yunus Kemal
d6e331d2c2 Translate categories_tr.yml via GitLocalize 2020-03-07 15:37:19 +00:00
PabloMarcendo
4138c9b696 Translate messages_nl.yml via GitLocalize 2020-03-07 15:30:27 +00:00
Senne Van Rompaey
c72d6e0de4 Translate messages_nl.yml via GitLocalize 2020-03-07 15:30:26 +00:00
PabloMarcendo
d0b5354288 Translate recipes_nl.yml via GitLocalize 2020-03-07 15:28:40 +00:00
TheBusyBiscuit
96179d9d36 [CI skip] Refactoring, documentation, reduced technical debt 2020-03-07 14:52:33 +01:00
TheBusyBiscuit
1c8a7e4958 Fixed Solar Generators not working 2020-03-07 11:35:29 +01:00
TheBusyBiscuit
f499f840c3 Changed Ignition Chamber to a Dropper 2020-03-07 00:10:52 +01:00
TheBusyBiscuit
0228b76f0b Cleaned up some old stuff and added new bStats charts 2020-03-06 16:39:07 +01:00
TheBusyBiscuit
0a3f910892 Back to the development branch 2020-03-06 11:48:39 +01:00
TheBusyBiscuit
82c6bb9b6d Pushing another build 2020-03-06 11:42:33 +01:00
TheBusyBiscuit
1a29f160b5
[CI skip] Merge pull request #1623 from TheBusyBiscuit/gitlocalize-11117 
Synced french translations
 2020-03-06 11:41:47 +01:00
TheBusyBiscuit
1977fa8deb
[CI skip] Merge pull request #1627 from TheBusyBiscuit/gitlocalize-11121 
Sync chinese (TW)
 2020-03-06 11:40:28 +01:00
TheBusyBiscuit
36eae141bc
[CI skip] Merge pull request #1628 from TheBusyBiscuit/gitlocalize-11122 
Sync Slovak
 2020-03-06 11:40:08 +01:00
TheBusyBiscuit
48c956a725
[CI skip] Merge pull request #1629 from TheBusyBiscuit/gitlocalize-11123 
Sync russian
 2020-03-06 11:39:56 +01:00
TheBusyBiscuit
4da7fc8073
[CI skip] Merge pull request #1631 from TheBusyBiscuit/gitlocalize-11125 
Sync arabic
 2020-03-06 11:39:33 +01:00
TheBusyBiscuit
0cd9329325
[CI skip] Merge pull request #1626 from TheBusyBiscuit/gitlocalize-11120 
Sync chinese
 2020-03-06 11:39:21 +01:00
TheBusyBiscuit
ee111cdefe
[CI skip] Merge pull request #1622 from TheBusyBiscuit/gitlocalize-11116 
Updated japanese
 2020-03-06 11:38:41 +01:00
TheBusyBiscuit
642c6aa2c1
[CI skip] Merge pull request #1621 from TheBusyBiscuit/gitlocalize-11115 
Updated pt-BR
 2020-03-06 11:38:27 +01:00
TheBusyBiscuit
a7f1879df4 [CI skip] Little bit more refactoring before another release candidate 2020-03-06 11:37:55 +01:00
TheBusyBiscuit
49897ff392 Translate messages_ar.yml via GitLocalize 2020-03-06 10:32:59 +00:00
TheBusyBiscuit
ec0fafc1bf Translate messages_ru.yml via GitLocalize 2020-03-06 10:31:10 +00:00
TheBusyBiscuit
5235383fda Translate messages_sk.yml via GitLocalize 2020-03-06 10:30:05 +00:00
TheBusyBiscuit
583717f7fd Translate messages_zh-TW.yml via GitLocalize 2020-03-06 10:29:16 +00:00
Nameless
60524e138f Translate messages_zh-CN.yml via GitLocalize 2020-03-06 10:28:47 +00:00
Pierre
3c7fc9c1cc Translate messages_fr.yml via GitLocalize 2020-03-06 10:25:46 +00:00
TheBusyBiscuit
5139c42b9c Translate messages_ja.yml via GitLocalize 2020-03-06 10:23:57 +00:00
Sakanas
6e7eac51e0 Translate messages_pt-BR.yml via GitLocalize 2020-03-06 10:23:21 +00:00
TheBusyBiscuit
d027106747 Translate messages_pt-BR.yml via GitLocalize 2020-03-06 10:23:20 +00:00
Nameless
882a4aa728
Fixed #1613 2020-03-06 09:54:07 +08:00
TheBusyBiscuit
4255aaa444 [CI skip] Refactoring + documentation 2020-03-06 01:57:50 +01:00
TheBusyBiscuit
42e13e6194 [CI skip] Updated documentation 2020-03-06 01:22:54 +01:00
TheBusyBiscuit
58b2ac0dfc [CI skip] More refactoring, reduced technical debt 2020-03-05 23:38:39 +01:00
TheBusyBiscuit
1544443ad1 [CI skip] Updated javadocs 2020-03-05 21:52:34 +01:00
TheBusyBiscuit
22776e828d [CI skip] Refactoring + Added Javadocs 2020-03-05 21:28:50 +01:00
TheBusyBiscuit
0ab4ba425c [CI skip] One more class 2020-03-05 01:02:03 +01:00
TheBusyBiscuit
f08521e7b9 [CI skip] And even more refactoring and documentation 2020-03-05 01:01:38 +01:00
TheBusyBiscuit
0369fac3d6 [CI skip] More refactoring and documentation 2020-03-05 00:52:14 +01:00
TheBusyBiscuit
c7040fee49 [CI skip] Refactoring + documentation. A lot of it. 2020-03-05 00:04:18 +01:00
TheBusyBiscuit
ba940206fa
[CI skip] Merge pull request #1610 from TheBusyBiscuit/gitlocalize-11094 
Updated hungarian
 2020-03-04 09:09:02 +01:00
Nameless
9965211dd3 Translate messages_zh-CN.yml via GitLocalize 2020-03-04 06:09:06 +00:00
András Marczinkó
6c50ccc3a9 Translate recipes_hu.yml via GitLocalize 2020-03-04 00:54:35 +00:00
András Marczinkó
ac4fe359ae Translate messages_hu.yml via GitLocalize 2020-03-02 23:33:14 +00:00
TheBusyBiscuit
f0f2f0be92 [CI skip] Refactoring and documentation 2020-03-02 14:25:33 +01:00
TheBusyBiscuit
25eca28be3 [CI skip] Added new RC tags to the GitHub Releases tab 2020-03-02 12:46:28 +01:00
TheBusyBiscuit
e9ca9aac66 [CI skip] Weird fix but ok 2020-03-01 19:55:56 +01:00
TheBusyBiscuit
f22d526398
[CI skip] Merge pull request #1603 from TheBusyBiscuit/gitlocalize-11073 
Implement categories_nl.yml
 2020-03-01 19:41:44 +01:00
TheBusyBiscuit
c8668ca54e
[CI skip] Merge pull request #1604 from TheBusyBiscuit/gitlocalize-11074 
Implement resources_nl.yml
 2020-03-01 19:40:47 +01:00
TheBusyBiscuit
5d677f59da [CI skip] Little change 2020-03-01 19:40:34 +01:00
Senne Van Rompaey
bf417b5aaf Translate resources_nl.yml via GitLocalize 2020-03-01 18:38:33 +00:00
Senne Van Rompaey
929a2e0810 Translate categories_nl.yml via GitLocalize 2020-03-01 18:38:05 +00:00
TheBusyBiscuit
b6e574fc1d [CI skip] More refactoring 2020-03-01 16:17:18 +01:00
Panda.com
7b74a347b6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into fix/performance-improvements 
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/GearListener.java
 2020-03-01 15:52:36 +01:00
TheBusyBiscuit
9eda7d1e5e [CI skip] Refactoring 2020-03-01 15:23:09 +01:00
TheBusyBiscuit
c3f6eb3a3d [CI skip] More refactoring 2020-03-01 15:06:35 +01:00
Panda.com
56648c464f last fix! 2020-03-01 14:59:11 +01:00
TheBusyBiscuit
aaff35152a [CI skip] Refactored Slimefun guide 2020-03-01 14:49:00 +01:00
Panda.com
efa8d81f77 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into fix/performance-improvements 
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/TalismanListener.java
 2020-03-01 14:33:44 +01:00
Panda.com
105b32583d Changed requested changes 2020-03-01 14:27:11 +01:00
TheBusyBiscuit
0609fa1b5f [CI skip] Added a warning for disabled auto-updaters. 2020-03-01 14:03:12 +01:00
TheBusyBiscuit
f007c1b68e [CI skip] Reduced technical debt 2020-03-01 10:36:31 +01:00
TheBusyBiscuit
dad60f85c4 Fixes #1577 2020-03-01 09:29:37 +01:00
TheBusyBiscuit
b2a0214ef0 [CI skip] More cleanup 2020-03-01 01:05:48 +01:00
TheBusyBiscuit
cec1107198 [CI skip] A bunch of refactoring 2020-02-29 23:42:02 +01:00
Daniel Walsh
cbd7faf4d7 General performance improvements 2020-02-27 16:11:32 +00:00
TheBusyBiscuit
9b0cb78960
Merge pull request #1584 from ThatPreston/master 
Add New Rainbow Blocks
 2020-02-26 23:49:39 +01:00
ThatPreston
5549eb77b7
Remove Rainbow Concrete Powder 2020-02-26 15:23:06 -06:00
ThatPreston
0414cae04a
Remove Rainbow Concrete Powder 2020-02-26 15:21:45 -06:00
ThatPreston
2197b7eabd
Update ResearchSetup.java 2020-02-26 15:20:04 -06:00
TheBusyBiscuit
57bedbbcfe
[CI skip] Merge pull request #1585 from TheBusyBiscuit/gitlocalize-11043 
Categories_es
 2020-02-26 20:49:55 +01:00
TheBusyBiscuit
ccca0e03c7
[CI skip] Merge pull request #1587 from TheBusyBiscuit/gitlocalize-11045 
recipes_es
 2020-02-26 20:49:30 +01:00
TheBusyBiscuit
00a0b5bf5f
[CI skip] Merge pull request #1589 from TheBusyBiscuit/gitlocalize-11047 
researches_es
 2020-02-26 20:48:58 +01:00
TheBusyBiscuit
6c3c0fbbbc
[CI skip] Merge pull request #1588 from TheBusyBiscuit/gitlocalize-11046 
messages_es
 2020-02-26 20:48:14 +01:00
TheBusyBiscuit
dd0b979423
[CI skip] Merge pull request #1586 from TheBusyBiscuit/gitlocalize-11044 
Resources_es
 2020-02-26 20:47:39 +01:00
SoSeDiK
5f653fe0e1 Translate messages_ru.yml via GitLocalize 2020-02-26 16:40:33 +00:00
TheBusyBiscuit
602ec46d28 Translate messages_ru.yml via GitLocalize 2020-02-26 16:40:32 +00:00
dbzjjoe
4fdef96b47 Translate researches_es.yml via GitLocalize 2020-02-26 16:00:35 +00:00
Vravinite
464bedc76d Translate researches_es.yml via GitLocalize 2020-02-26 16:00:34 +00:00
Luu7
ca425a5de9 Translate messages_es.yml via GitLocalize 2020-02-26 15:58:07 +00:00
Vravinite
c9e055a655 Translate messages_es.yml via GitLocalize 2020-02-26 15:58:06 +00:00
Vravinite
c46100c081 Translate recipes_es.yml via GitLocalize 2020-02-26 15:56:01 +00:00
Vravinite
f58b8ab43c Translate resources_es.yml via GitLocalize 2020-02-26 15:33:27 +00:00
Vravinite
73dad7020e Translate categories_es.yml via GitLocalize 2020-02-26 15:32:59 +00:00
ThatPreston
1e9dc2b85d
Added New Rainbow Blocks 
Added rainbow concrete, concrete powder, and glazed terracotta to the rainbow blocks research group.
 2020-02-25 18:38:45 -06:00
ThatPreston
d12f7b4b8e
Added New Rainbow Blocks 
Added normal and seasonal variants of rainbow concrete, concrete powder, and glazed terracotta.
 2020-02-25 18:36:53 -06:00
ThatPreston
4c8bb36c6a
Added New Seasonal Rainbow Blocks 
Added Christmas, Halloween, and Valentine's Day variants of rainbow concrete, concrete powder, and glazed terracotta.
 2020-02-25 18:15:14 -06:00
ThatPreston
ab1c9318a6
Add new Rainbow Blocks 
Added Rainbow Concrete, Rainbow Concrete Powder, and Rainbow Glazed Terracotta
 2020-02-25 17:53:28 -06:00
András Marczinkó
312eac4308 Translate recipes_hu.yml via GitLocalize 2020-02-24 20:22:27 +00:00
András Marczinkó
bf3ebc5768 Translate messages_hu.yml via GitLocalize 2020-02-24 20:22:23 +00:00
KillerXCoder
1d4f8ec7f2 Translate recipes_sk.yml via GitLocalize 2020-02-24 10:56:30 +00:00
Muhammad Kamal Fergany
2b09c413c3 Translate messages_ar.yml via GitLocalize 2020-02-24 08:17:52 +00:00
TheBusyBiscuit
78a307c31c Translate messages_ar.yml via GitLocalize 2020-02-24 08:17:50 +00:00
Nameless
0a5fffb1ce Translate recipes_zh-CN.yml via GitLocalize 2020-02-23 23:57:57 +00:00
TheBusyBiscuit
15e57ffd9c Pushing another build again 2020-02-24 00:53:13 +01:00
TheBusyBiscuit
dfcb06180d
[CI skip] Merge pull request #1572 from TheBusyBiscuit/gitlocalize-10999 
Update messages_zh-CN.yml
 2020-02-23 10:51:55 +01:00
nahkd123
acc222db4a Translate messages_vi.yml via GitLocalize 2020-02-23 03:02:14 +00:00
Nameless
8b908a6f91 Translate messages_zh-CN.yml via GitLocalize 2020-02-23 01:41:38 +00:00
TheBusyBiscuit
2869a654c9 [CI skip] More Refactoring 2020-02-23 00:59:55 +01:00
András Marczinkó
f9b8f85a7c Translate messages_hu.yml via GitLocalize 2020-02-22 23:14:09 +00:00
TheBusyBiscuit
dcd7146949 [CI skip] Some minor changes 2020-02-22 18:54:23 +01:00
TheBusyBiscuit
ae782d9d7a
[CI skip] Merge pull request #1569 from TheBusyBiscuit/gitlocalize-10993 
Added chinese (TW) recipe types
 2020-02-22 17:40:58 +01:00
TheBusyBiscuit
e50c097ed0
[CI skip] Merge pull request #1568 from TheBusyBiscuit/gitlocalize-10992 
Updated Chinese (Taiwan)
 2020-02-22 17:40:41 +01:00
HeroBrineKing
560c76eeff Translate recipes_zh-TW.yml via GitLocalize 2020-02-22 16:38:45 +00:00
HeroBrineKing
dbb94421d0 Translate messages_zh-TW.yml via GitLocalize 2020-02-22 16:37:30 +00:00
TheBusyBiscuit
bdb4ba07ea Translate messages_zh-TW.yml via GitLocalize 2020-02-22 16:37:29 +00:00
Turret
e4fc507357 Translate messages_sv.yml via GitLocalize 2020-02-22 16:15:53 +00:00
bito-blosh
1a172865e7 Translate messages_ja.yml via GitLocalize 2020-02-22 16:05:58 +00:00
TheBusyBiscuit
b494dc1e00 Translate messages_ja.yml via GitLocalize 2020-02-22 16:05:57 +00:00
Dams_
837b58e3cb Translate recipes_fr.yml via GitLocalize 2020-02-22 15:17:57 +00:00
Edwin Kerforne
6df40df8c6 Translate recipes_fr.yml via GitLocalize 2020-02-22 15:17:55 +00:00
Edwin Kerforne
239e76d027 Translate messages_fr.yml via GitLocalize 2020-02-22 15:10:18 +00:00
Pierre
d58e56dea1 Translate messages_fr.yml via GitLocalize 2020-02-22 15:10:16 +00:00
TheBusyBiscuit
add25fa75a
[ci skip] Merge pull request #1563 from TheBusyBiscuit/gitlocalize-10986 
Added german recipe translations
 2020-02-22 16:09:09 +01:00
TheBusyBiscuit
5a8b12a242
[ci skip] Merge pull request #1562 from TheBusyBiscuit/gitlocalize-10985 
Updated german messages
 2020-02-22 16:08:53 +01:00
TheBusyBiscuit
a64b8b0df9
[ci skip] Merge pull request #1561 from TheBusyBiscuit/gitlocalize-10984 
Messages - Slovak language
 2020-02-22 16:08:40 +01:00
TheBusyBiscuit
5825c4db1a Translate recipes_de.yml via GitLocalize 2020-02-22 15:07:28 +00:00
TheBusyBiscuit
cfdf98a5e5 [CI skip] Fixed a typo 2020-02-22 15:59:42 +01:00
TheBusyBiscuit
35024f4186 Translate messages_de.yml via GitLocalize 2020-02-22 14:48:10 +00:00
KillerXCoder
4c97eb2988 Translate messages_sk.yml via GitLocalize 2020-02-22 14:45:24 +00:00
TheBusyBiscuit
8c4892a304 Translate messages_sk.yml via GitLocalize 2020-02-22 14:45:23 +00:00
TheBusyBiscuit
51d33dee02 [CI skip] Recipe Types can now be translated as well 2020-02-22 15:41:35 +01:00
Nameless
0c3884ca91
Fix #1558 2020-02-22 18:55:09 +08:00
TheBusyBiscuit
9ca20379a2 [Ci skip] Some more refactoring 2020-02-21 22:13:38 +01:00
TheBusyBiscuit
6175cff35a A Refactoring Supernova - You don't wanna look at the Diff 2020-02-21 21:22:26 +01:00
TheBusyBiscuit
f9f3e495e7 [CI skip] Refactoring 2020-02-21 12:09:12 +01:00
TheBusyBiscuit
155a9572c4 Fixed #1557 2020-02-21 11:00:41 +01:00
Nameless
078b506aca
Try to fix #1513 2020-02-20 11:15:06 +08:00
ThatPreston
c0af5eee77
Update SlimefunManager.java 2020-02-19 13:51:05 -06:00
TheBusyBiscuit
f5eb90f3d0 [CI skip] Removed some empty strings 2020-02-16 16:12:15 +01:00
TheBusyBiscuit
682755f106 Switching back to the development branch 2020-02-16 12:22:59 +01:00
TheBusyBiscuit
3226f57e8d Pushing another stable build 2020-02-16 12:21:25 +01:00
TheBusyBiscuit
5e74657263 [CI skip] Changed the API a bit 2020-02-16 12:17:14 +01:00
TheBusyBiscuit
70ee567b3c
[CI skip] Merge pull request #1547 from TheBusyBiscuit/gitlocalize-10944 
Added resources for brazil
 2020-02-16 11:38:25 +01:00
TheBusyBiscuit
df21cb99e0
[CI skip] Merge pull request #1546 from TheBusyBiscuit/gitlocalize-10943 
Added researches for brazil
 2020-02-16 11:38:14 +01:00
TheBusyBiscuit
1163166588
[CI skip] Merge pull request #1548 from TheBusyBiscuit/gitlocalize-10945 
Added categories for brazil
 2020-02-16 11:38:03 +01:00
Yuri Nogueira Moreira da Silva
0dbe7961f5 Translate categories_pt-BR.yml via GitLocalize 2020-02-16 10:36:19 +00:00
Yuri Nogueira Moreira da Silva
f93a813c8e Translate resources_pt-BR.yml via GitLocalize 2020-02-16 10:36:07 +00:00
Yuri Nogueira Moreira da Silva
f836cf1540 Translate researches_pt-BR.yml via GitLocalize 2020-02-16 10:35:53 +00:00
G4stavoM1ster
160caaaa24 Translate researches_pt-BR.yml via GitLocalize 2020-02-16 10:35:51 +00:00
Yuri Nogueira Moreira da Silva
b7bb419667 Translate messages_pt-BR.yml via GitLocalize 2020-02-16 10:35:30 +00:00
G4stavoM1ster
1db16b7a44 Translate messages_pt-BR.yml via GitLocalize 2020-02-16 10:35:27 +00:00
TheBusyBiscuit
9510d9b1fb [CI skip] Updated translators 2020-02-15 20:43:21 +01:00
TheBusyBiscuit
85fd76c8da
[CI skip] Merge pull request #1544 from TheBusyBiscuit/gitlocalize-10940 
Added czech resources
 2020-02-15 20:39:13 +01:00
TheBusyBiscuit
9398316bee
[CI skip] Merge pull request #1543 from TheBusyBiscuit/gitlocalize-10939 
Added czech categories
 2020-02-15 20:38:57 +01:00
TheBusyBiscuit
f036d14e48
[CI skip] Merge pull request #1541 from TheBusyBiscuit/gitlocalize-10937 
Updated czech resources
 2020-02-15 20:38:29 +01:00
TheBusyBiscuit
022be20242
[CI skip] Merge pull request #1542 from TheBusyBiscuit/gitlocalize-10938 
Updated czech messages
 2020-02-15 20:38:11 +01:00
jakmanda05
6800181c64 Translate researches_cs.yml via GitLocalize 2020-02-15 19:37:28 +00:00
Aile-Minicraftcz
ac27101dd5 Translate researches_cs.yml via GitLocalize 2020-02-15 19:37:26 +00:00
jakmanda05
c9d9a85ebb Translate categories_cs.yml via GitLocalize 2020-02-15 19:37:06 +00:00
Aile-Minicraftcz
9432fdab84 Translate categories_cs.yml via GitLocalize 2020-02-15 19:37:04 +00:00
Friggo
a23c6010b6 Translate categories_cs.yml via GitLocalize 2020-02-15 19:37:01 +00:00
IsLineCZ
4b9d491dc8 Translate messages_cs.yml via GitLocalize 2020-02-15 19:36:09 +00:00
Aile-Minicraftcz
6a0ed7ab5d Translate resources_cs.yml via GitLocalize 2020-02-15 19:35:46 +00:00
András Marczinkó
55d4a949fc Translate messages_hu.yml via GitLocalize 2020-02-15 19:35:25 +00:00
TheBusyBiscuit
0ec53e94d8
[CI skip] Merge pull request #1535 from TheBusyBiscuit/gitlocalize-10902 
Polish category translation for Slimefun
 2020-02-15 20:30:27 +01:00
TheBusyBiscuit
5a9d6f3d08
[CI skip] Merge pull request #1536 from TheBusyBiscuit/gitlocalize-10903 
Polish resources translation for Slimefun
 2020-02-15 20:29:46 +01:00
TheBusyBiscuit
6b724bafa1
[CI skip] Merge pull request #1537 from TheBusyBiscuit/gitlocalize-10917 
messages_es
 2020-02-15 20:28:37 +01:00
koloksk
326e730546
Spelling correction 2020-02-15 15:38:25 +01:00
dbzjjoe
82b0d2229f Translate messages_es.yml via GitLocalize 2020-02-14 21:21:12 +00:00
Luu7
a57ef4db95 Translate messages_es.yml via GitLocalize 2020-02-14 21:21:11 +00:00
Wirusiu
37d95b2200 Translate resources_pl.yml via GitLocalize 2020-02-14 17:29:27 +00:00
Wirusiu
51c9799c17 Translate categories_pl.yml via GitLocalize 2020-02-14 17:26:35 +00:00
TheBusyBiscuit
7d1e3b729e [CI skip] Updated change log 2020-02-14 10:49:45 +01:00
Nameless
b703f176a2
Fixed magician talisman can't give book extra enchantment 2020-02-14 11:16:41 +08:00
TheBusyBiscuit
e3a778ded1 [CI skip] Updated translators list 2020-02-14 01:57:41 +01:00
TheBusyBiscuit
09de53237b
[CI skip] Merge pull request #1529 from TheBusyBiscuit/gitlocalize-10893 
Added Japanese
 2020-02-14 01:42:30 +01:00
TheBusyBiscuit
e843cb7b10
[CI skip] Merge pull request #1531 from TheBusyBiscuit/gitlocalize-10895 
Updated japanese
 2020-02-14 01:42:18 +01:00
TheBusyBiscuit
59d3c00333
[CI skip] Merge pull request #1530 from TheBusyBiscuit/gitlocalize-10894 
Added Japanese resources
 2020-02-14 01:42:07 +01:00
TheBusyBiscuit
9936c4ab95
[CI skip] Merge pull request #1532 from TheBusyBiscuit/gitlocalize-10896 
Added japanese categories
 2020-02-14 01:41:53 +01:00
TheBusyBiscuit
db3f448717
[CI skip] Merge pull request #1523 from TheBusyBiscuit/gitlocalize-10884 
Updated chiense translation
 2020-02-14 01:41:39 +01:00
bito-blosh
0bac34ce33 Translate categories_ja.yml via GitLocalize 2020-02-14 00:40:58 +00:00
bito-blosh
252cb58151 Translate researches_ja.yml via GitLocalize 2020-02-14 00:40:39 +00:00
bito-blosh
81424d0652 Translate resources_ja.yml via GitLocalize 2020-02-14 00:40:10 +00:00
bito-blosh
1a4519a2c2 Translate messages_ja.yml via GitLocalize 2020-02-14 00:39:55 +00:00
TheBusyBiscuit
c21c44446d
[CI skip] Merge pull request #1525 from TheBusyBiscuit/gitlocalize-10887 
Messages - Slovak language
 2020-02-13 21:30:51 +01:00
TheBusyBiscuit
a8580619d1
[CI skip] Merge pull request #1526 from TheBusyBiscuit/gitlocalize-10888 
Updated Chinese (Taiwan)
 2020-02-13 21:29:06 +01:00
TheBusyBiscuit
399240ed22
[CI skip] Merge pull request #1527 from TheBusyBiscuit/gitlocalize-10889 
Updated Russian messages
 2020-02-13 21:27:14 +01:00
TheBusyBiscuit
dace6a610c
[CI skip] Merge pull request #1528 from TheBusyBiscuit/gitlocalize-10892 
Updated Arabic Messages Translation
 2020-02-13 21:25:18 +01:00
Muhammad Kamal Fergany
74bcf19cb8 Translate messages_ar.yml via GitLocalize 2020-02-13 17:54:44 +00:00
TomWiskis
b5a63a42a7 Translate messages_ru.yml via GitLocalize 2020-02-13 11:02:08 +00:00
SoSeDiK
2c0627644d Translate messages_ru.yml via GitLocalize 2020-02-13 11:02:07 +00:00
HeroBrineKing
00819420b9 Translate messages_zh-TW.yml via GitLocalize 2020-02-13 09:23:04 +00:00
KillerXCoder
d3da78307d Translate messages_sk.yml via GitLocalize 2020-02-13 08:44:09 +00:00
Turret
3d5fea47dc Translate messages_sv.yml via GitLocalize 2020-02-13 07:44:35 +00:00
Nameless
3abf6f0e30 Translate messages_zh-CN.yml via GitLocalize 2020-02-13 01:05:43 +00:00
TheBusyBiscuit
ecfd242c32
Merge branch 'master' into patch-2 2020-02-13 01:46:02 +01:00
Edwin Kerforne
274db4a558 Translate messages_fr.yml via GitLocalize 2020-02-13 00:41:20 +00:00
Pierre
1d826a8b1d Translate messages_fr.yml via GitLocalize 2020-02-13 00:41:19 +00:00
Nameless
d8c29ec7bb
Double ores by drop items 2020-02-13 08:40:18 +08:00
TheBusyBiscuit
430a27d164 Translate messages_de.yml via GitLocalize 2020-02-13 00:36:24 +00:00
TheBusyBiscuit
0ff1311c32 [CI skip] Updated language files and reduced technical debt 2020-02-13 01:30:27 +01:00
TheBusyBiscuit
14623e7378
[CI skip] Merge pull request #1519 from TheBusyBiscuit/gitlocalize-10881 
Researches - Slovak language
 2020-02-12 18:20:13 +01:00
Nameless
ef3c1f3d10
Update TalismanListener.java 2020-02-12 21:39:42 +08:00
KillerXCoder
06a8c72720 Translate researches_sk.yml via GitLocalize 2020-02-12 12:17:08 +00:00
KillerXCoder
fd04eb6abb Translate categories_sk.yml via GitLocalize 2020-02-12 11:55:50 +00:00
Nameless
c25a39c955
Avoid can't get bonus items 2020-02-12 16:43:53 +08:00
Nameless
07b7ed73fa
Fixed give more items when using fortune pickaxe 2020-02-12 14:39:16 +08:00
Nameless
c899413f7f
Forgot to import packages 2020-02-12 14:14:08 +08:00
Nameless
b87354a39e
Fixed #1516 2020-02-12 14:07:42 +08:00
TheBusyBiscuit
55b01b61f1 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-11 22:22:43 +01:00
TheBusyBiscuit
2cf5989d7a More cleanup and Refactoring 2020-02-11 22:22:33 +01:00
TheBusyBiscuit
92ab904a41
Merge pull request #1514 from StarWishsama/patch-1 
Fixed can't back in setting opened by command
 2020-02-11 21:16:34 +01:00
TheBusyBiscuit
17cf48a773 [CI skip] Fixes #1515 2020-02-11 21:16:09 +01:00
Nameless
302a059bf8
Fixed can't back in setting opened by command 2020-02-11 15:51:10 +08:00
TheBusyBiscuit
7d915dbb95
Merge pull request #1510 from TheBusyBiscuit/gitlocalize-10828 
Added czech resource translations
 2020-02-10 18:01:09 +01:00
TheBusyBiscuit
3955639f24
[CI skip] Merge pull request #1511 from TheBusyBiscuit/gitlocalize-10831 
Added czech translation
 2020-02-10 18:00:36 +01:00
TheBusyBiscuit
e3a02ea52d [CI skip] Updated /sf research 2020-02-10 18:00:14 +01:00
TheBusyBiscuit
0d9908b4b5 Translate messages_cs.yml via GitLocalize 2020-02-10 16:59:45 +00:00
sad_mirai
d08094c5f6 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:30 +00:00
jakmanda05
c242b6a400 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:28 +00:00
Aile-Minicraftcz
fe8275ab05 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:26 +00:00
Tengoblinekcz
c704f6e5d9 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:24 +00:00
sirhCCC
76e699f6c7 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:22 +00:00
Thezerix
f4f1da6ea2 Translate messages_cs.yml via GitLocalize 2020-02-10 16:49:20 +00:00
TheBusyBiscuit
f5dd391566 [Ci skip] Reduced cognitive complexity 2020-02-10 13:52:38 +01:00
TheBusyBiscuit
b5a7b5f5b6 [CI skip] Removed a redundancy 2020-02-10 13:45:50 +01:00
TheBusyBiscuit
fbc1726e5d [CI skip] Added czech translators 2020-02-10 12:51:39 +01:00
jakmanda05
16942a1141 Translate resources_cs.yml via GitLocalize 2020-02-10 11:47:32 +00:00
GGGEDR
b8e5c60bb3 Translate resources_cs.yml via GitLocalize 2020-02-10 11:47:30 +00:00
sad_mirai
a01328554e Translate resources_cs.yml via GitLocalize 2020-02-10 11:47:28 +00:00
TheBusyBiscuit
b916c3636b [CI skip] A lot of internal cleanup, performance improvements 2020-02-10 12:42:34 +01:00
TheBusyBiscuit
e53746990e [CI skip] Reduced technical debt 2020-02-09 23:13:15 +01:00
Muhammad Kamal Fergany
b6336d3962 Translate categories_ar.yml via GitLocalize 2020-02-09 21:22:21 +00:00
Muhammad Kamal Fergany
6eb851d142 Translate resources_ar.yml via GitLocalize 2020-02-09 20:56:26 +00:00
Turret
e999a6e38e Translate researches_sv.yml via GitLocalize 2020-02-09 14:01:55 +00:00
TheBusyBiscuit
3a5a18ae70 [CI skip] Moved some items to different categories 2020-02-09 13:42:21 +01:00
TheBusyBiscuit
e6c2cbf5fc Added unfinished languages back into the development branch 2020-02-09 12:19:35 +01:00
TheBusyBiscuit
04709365a4 Finishing touches, new stable release incoming 2020-02-09 12:04:06 +01:00
TheBusyBiscuit
e0e46995af [Ci skip] Little fix 2020-02-09 11:15:34 +01:00
Nameless
6e34f86797 Give filled knowledge flask as SlimefunItem 2020-02-09 18:10:45 +08:00
TheBusyBiscuit
9bdd961332 [CI skip] Updated bStats and CS-CoreLib2 2020-02-09 11:03:46 +01:00
TheBusyBiscuit
cefa85f451 [CI skip] Removed deprecated method 2020-02-09 00:30:31 +01:00
TheBusyBiscuit
be43f825a9 [Ci skip] Refactored Androids 2020-02-09 00:26:04 +01:00
TheBusyBiscuit
8b3b67e5c5 [CI skip] Removed deprecated method 2020-02-08 23:02:25 +01:00
TheBusyBiscuit
8b3aa8ffbe [Ci skip] Refactoring 2020-02-08 22:58:55 +01:00
TheBusyBiscuit
55cf5a1079 [Ci skip] Improved debugging and removed a deprecated class 2020-02-08 22:42:11 +01:00
Edwin Kerforne
de0aab2113 Translate resources_fr.yml via GitLocalize 2020-02-08 20:40:12 +00:00
TheBusyBiscuit
bdb3b8705a [CI skip] Merge pull request #1500 from TheBusyBiscuit/gitlocalize-10800 
Updated chinese (TW) researches
 2020-02-08 21:35:42 +01:00
TheBusyBiscuit
455d0ea082
[CI skip] Merge pull request #1499 from TheBusyBiscuit/gitlocalize-10799 
Updated chinese (TW) messages
 2020-02-08 21:35:32 +01:00
TheBusyBiscuit
0226d1b205 [CI skip] Merge pull request #1498 from TheBusyBiscuit/gitlocalize-10798 
Added chinese (taiwan) categories
 2020-02-08 21:35:21 +01:00
HeroBrineKing
d2d1046dc2 Translate researches_zh-TW.yml via GitLocalize 2020-02-08 20:34:49 +00:00
HeroBrineKing
f246781bad Translate messages_zh-TW.yml via GitLocalize 2020-02-08 20:34:36 +00:00
HeroBrineKing
263a920732 Translate categories_zh-TW.yml via GitLocalize 2020-02-08 20:34:16 +00:00
HeroBrineKing
c639595637 Translate resources_zh-TW.yml via GitLocalize 2020-02-08 20:33:25 +00:00
TheBusyBiscuit
5e0e260dae Translate resources_zh-TW.yml via GitLocalize 2020-02-08 20:33:23 +00:00
TheBusyBiscuit
447683b600 [CI skip] Refactoring 2020-02-08 20:50:21 +01:00
TheBusyBiscuit
7d38654452 [CI skip] Merge pull request #1495 from TheBusyBiscuit/gitlocalize-10794 
messages_es
 2020-02-08 20:49:26 +01:00
TheBusyBiscuit
3faacfbd53
[CI skip] Merge pull request #1496 from TheBusyBiscuit/gitlocalize-10795 
researches_es
 2020-02-08 20:48:36 +01:00
TheBusyBiscuit
e7783ad8fc [CI skip] Merge pull request #1494 from TheBusyBiscuit/gitlocalize-10793 
Resources_es
 2020-02-08 20:48:12 +01:00
Luu7
a52fc39977 Translate researches_es.yml via GitLocalize 2020-02-08 19:45:09 +00:00
dbzjjoe
6508489b8f Translate researches_es.yml via GitLocalize 2020-02-08 19:45:07 +00:00
Luu7
3131774b5e Translate messages_es.yml via GitLocalize 2020-02-08 19:44:42 +00:00
Luu7
fb04b87030 Translate resources_es.yml via GitLocalize 2020-02-08 19:44:11 +00:00
dbzjjoe
6fe8ccf10e Translate resources_es.yml via GitLocalize 2020-02-08 19:44:08 +00:00
Luu7
f74d2276de Translate categories_es.yml via GitLocalize 2020-02-08 19:41:46 +00:00
dbzjjoe
15aab25b76 Translate categories_es.yml via GitLocalize 2020-02-08 19:36:31 +00:00
Luu7
a3a600c6e9 Translate categories_es.yml via GitLocalize 2020-02-08 19:36:29 +00:00
TheBusyBiscuit
91856087f5
[CI skip] Merge pull request #1491 from TheBusyBiscuit/gitlocalize-10790 
Updated hungarian resources
 2020-02-08 20:28:58 +01:00
András Marczinkó
8aa227e0ab Translate categories_hu.yml via GitLocalize 2020-02-08 19:28:32 +00:00
András Marczinkó
454e46c86a Translate resources_hu.yml via GitLocalize 2020-02-08 19:28:05 +00:00
NihilistBrew
5674570175 small formatting 2020-02-08 13:58:01 +01:00
TheBusyBiscuit
340258323b
[CI skip] Merge pull request #1486 from TheBusyBiscuit/gitlocalize-10787 
Translation 2
 2020-02-08 11:11:38 +01:00
Turret
1016c0942f Translate resources_sv.yml via GitLocalize 2020-02-08 09:57:20 +00:00
Turret
ab4e8a3bf0 Translate categories_sv.yml via GitLocalize 2020-02-08 09:49:51 +00:00
NihilistBrew
5028911e84 Translate categories_sv.yml via GitLocalize 2020-02-08 09:49:49 +00:00
Poma123
4f6ca04843
Merge pull request #2 from TheBusyBiscuit/master 
Comparing new changes
 2020-02-08 10:05:53 +01:00
TheBusyBiscuit
38830b3bdf [Ci skip] Updated translators 2020-02-08 10:02:12 +01:00
TheBusyBiscuit
d877698000
[Ci skip] Merge pull request #1475 from TheBusyBiscuit/gitlocalize-10777 
Update Categories in Vietnamese
 2020-02-08 10:01:40 +01:00
TheBusyBiscuit
d7280c110e
[CI skip] Merge pull request #1476 from TheBusyBiscuit/gitlocalize-10778 
Update Resources Vietnamese
 2020-02-08 10:01:22 +01:00
TheBusyBiscuit
3cc53ccb2d
[CI skip] Merge pull request #1478 from TheBusyBiscuit/gitlocalize-10780 
Update categories_zh-CN.yml
 2020-02-08 10:00:20 +01:00
TheBusyBiscuit
64a22b721f [Ci skip] Merge pull request #1479 from TheBusyBiscuit/gitlocalize-10781 
Update resources_zh-CN.yml
 2020-02-08 10:00:03 +01:00
TheBusyBiscuit
b55b2af133
[CI skip] Merge pull request #1477 from TheBusyBiscuit/gitlocalize-10779 
New words translated
 2020-02-08 09:59:25 +01:00
TheBusyBiscuit
4c01ec7e57
[Ci skip] Merge pull request #1481 from TheBusyBiscuit/gitlocalize-10783 
Resources - Slovak langugage
 2020-02-08 09:58:59 +01:00
TheBusyBiscuit
95e16089c5 [Ci skip] Merge pull request #1482 from TheBusyBiscuit/gitlocalize-10784 
Categories - Slovak language
 2020-02-08 09:58:17 +01:00
TheBusyBiscuit
231f8904c4
[Ci skip] Merge pull request #1483 from TheBusyBiscuit/gitlocalize-10785 
Localized categories to Russian
 2020-02-08 09:57:52 +01:00
poma123
9bb3fea54c Fix PickaxeOfContainmnet bug 2020-02-08 09:57:46 +01:00
SoSeDiK
6259064f38 Translate resources_ru.yml via GitLocalize 2020-02-08 08:51:43 +00:00
TomWiskis
3ab18bf79b Translate resources_ru.yml via GitLocalize 2020-02-08 08:51:41 +00:00
SoSeDiK
39949076ab Translate categories_ru.yml via GitLocalize 2020-02-08 08:51:20 +00:00
TomWiskis
32a6ac0266 Translate categories_ru.yml via GitLocalize 2020-02-08 08:51:18 +00:00
KillerXCoder
5254ea5f3b Translate categories_sk.yml via GitLocalize 2020-02-08 08:14:25 +00:00
KillerXCoder
539cd86a24 Translate resources_sk.yml via GitLocalize 2020-02-08 08:07:16 +00:00
Nameless
7d83a331c2 Translate resources_zh-CN.yml via GitLocalize 2020-02-08 06:23:40 +00:00
Nameless
12c4cb6df2 Translate categories_zh-CN.yml via GitLocalize 2020-02-08 06:23:11 +00:00
Dams_
1099e10036 Translate categories_fr.yml via GitLocalize 2020-02-08 03:05:42 +00:00
Edwin Kerforne
2c78456fa3 Translate categories_fr.yml via GitLocalize 2020-02-08 03:05:40 +00:00
JustAPieOP
01579cfeb6 Translate resources_vi.yml via GitLocalize 2020-02-08 02:49:49 +00:00
Julie-Sigtuna
37491587bc Translate resources_vi.yml via GitLocalize 2020-02-08 02:49:47 +00:00
Julie-Sigtuna
0b41496d76 Translate categories_vi.yml via GitLocalize 2020-02-08 02:47:53 +00:00
Just Mango
e9ab47e54a Translate categories_vi.yml via GitLocalize 2020-02-08 02:47:51 +00:00
TheBusyBiscuit
f68d110a43 [Ci skip] Minor design change 2020-02-08 02:55:49 +01:00
TheBusyBiscuit
71dcb17d25
[CI skip] Merge pull request #1473 from TheBusyBiscuit/gitlocalize-10775 
Added german GEO Resources
 2020-02-08 02:52:39 +01:00
TheBusyBiscuit
caecae4b0d Translate categories_de.yml via GitLocalize 2020-02-08 01:51:32 +00:00
TheBusyBiscuit
19d8ad88ea Translate resources_de.yml via GitLocalize 2020-02-08 01:47:11 +00:00
TheBusyBiscuit
f3c7bbdb43 [CI skip] Updated something 2020-02-08 02:38:54 +01:00
TheBusyBiscuit
4f94f87301
[Ci skip] Merge pull request #1467 from TheBusyBiscuit/gitlocalize-10773 
Messages - Slovak language
 2020-02-08 02:38:22 +01:00
TheBusyBiscuit
5317c46b2f [CI skip] "a shit ton" may be an understatement 2020-02-08 02:36:57 +01:00
KillerXCoder
2545948295 Translate messages_sk.yml via GitLocalize 2020-02-07 19:30:49 +00:00
TheBusyBiscuit
e10f5a9766
[CI skip] Merge pull request #1466 from TheBusyBiscuit/gitlocalize-10771 
Arabic Messages Translation
 2020-02-07 20:08:52 +01:00
Muhammad Kamal Fergany
792279cc2d Translate messages_ar.yml via GitLocalize 2020-02-07 18:35:57 +00:00
Muhammad Kamal Fergany
c8cf172b34 Translate researches_ar.yml via GitLocalize 2020-02-07 18:33:59 +00:00
András Marczinkó
e966742fd9 Translate researches_hu.yml via GitLocalize 2020-02-06 21:35:51 +00:00
TheBusyBiscuit
ee695f8dee [Ci skip] Code improvements 2020-02-06 22:31:45 +01:00
András Marczinkó
c61e919ec0 Translate messages_hu.yml via GitLocalize 2020-02-06 20:18:13 +00:00
NihilistBrew
063dea5796 Translate messages_sv.yml via GitLocalize 2020-02-06 19:38:49 +00:00
Turret
edf317ee64 Translate messages_sv.yml via GitLocalize 2020-02-06 19:38:48 +00:00
TheBusyBiscuit
ccc1048eed [CI skip] A little bit refactoring 2020-02-06 20:38:32 +01:00
TheBusyBiscuit
f9987d1308 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-06 20:25:07 +01:00
TheBusyBiscuit
a09e8e42cc
[Ci skip] Another test 2020-02-06 20:10:24 +01:00
TheBusyBiscuit
1163996360
[Ci skip] Test 2020-02-06 20:08:33 +01:00
TheBusyBiscuit
f5105c858f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-06 19:43:57 +01:00
Pierre
5b8343f909 Translate messages_fr.yml via GitLocalize 2020-02-06 18:34:08 +00:00
TheBusyBiscuit
df60d4c2fd [Ci skip] Updated translators 2020-02-06 19:20:37 +01:00
TheBusyBiscuit
c33054cffd [CI skip] Updated translators 2020-02-06 19:03:47 +01:00
TheBusyBiscuit
62e4712067 [CI skip] Updated languages 2020-02-05 23:34:17 +01:00
TheBusyBiscuit
28f1ba1aec Translate messages_zh-TW.yml via GitLocalize 2020-02-05 22:30:35 +00:00
HeroBrineKing
be0fb18617 Translate messages_zh-TW.yml via GitLocalize 2020-02-05 22:30:34 +00:00
TheBusyBiscuit
26bbf0794a [Ci skip] Fixed norwegian 2020-02-05 23:21:15 +01:00
TheBusyBiscuit
78cb1bf55a
[Ci skip] Merge pull request #1457 from TheBusyBiscuit/gitlocalize-10716 
Localized researches to Russian
 2020-02-05 23:20:29 +01:00
TheBusyBiscuit
ae1a3aa739
[CI skip] Merge pull request #1453 from TheBusyBiscuit/gitlocalize-10712 
Update messages_zh-CN.yml
 2020-02-05 23:20:10 +01:00
TheBusyBiscuit
a3fe369495
[Ci skip] Merge pull request #1451 from TheBusyBiscuit/gitlocalize-10706 
Fixed resource_vi.yml #3
 2020-02-05 23:19:53 +01:00
TheBusyBiscuit
5d12e4bf1d
[Ci skip] Merge pull request #1455 from TheBusyBiscuit/gitlocalize-10714 
Added more Russian messages
 2020-02-05 23:19:30 +01:00
TheBusyBiscuit
540e4c518b
[CI skip] Merge pull request #1456 from TheBusyBiscuit/gitlocalize-10715 
Messages - Slovak language
 2020-02-05 23:18:53 +01:00
TheBusyBiscuit
0eb9368dc3 [Ci skip] Updated vietnamese 2020-02-05 23:18:32 +01:00
TheBusyBiscuit
b22dd51954
Merge pull request #1452 from TheBusyBiscuit/gitlocalize-10707 
Updated some new line of messages_vi.yml
 2020-02-05 23:17:54 +01:00
TheBusyBiscuit
4d57e6e221
[Ci skip] Merge pull request #1454 from TheBusyBiscuit/gitlocalize-10713 
Improved a translation
 2020-02-05 23:17:32 +01:00
TheBusyBiscuit
a4e472cae4 Translate messages_de.yml via GitLocalize 2020-02-05 22:16:40 +00:00
TheBusyBiscuit
3786791044 [CI skip] Maybe fixed norwegian? 2020-02-05 22:16:09 +01:00
NihilistBrew
162a5e45f3
Update SlimefunItems.java 2020-02-05 16:13:22 +01:00
NihilistBrew
9a672b3fde
formatting 2020-02-05 15:43:13 +01:00
TomWiskis
3589491b2f Translate researches_ru.yml via GitLocalize 2020-02-05 12:14:22 +00:00
SoSeDiK
dc5d447d9b Translate researches_ru.yml via GitLocalize 2020-02-05 12:14:20 +00:00
KillerXCoder
7657a1338d Translate messages_sk.yml via GitLocalize 2020-02-05 12:13:53 +00:00
TomWiskis
ca4a9e7689 Translate messages_ru.yml via GitLocalize 2020-02-05 12:02:18 +00:00
SoSeDiK
7bb437e0c8 Translate messages_ru.yml via GitLocalize 2020-02-05 12:02:17 +00:00
Nameless
8ca32fe4ec Translate researches_zh-CN.yml via GitLocalize 2020-02-05 08:38:59 +00:00
Nameless
f0aaca54f4 Translate messages_zh-CN.yml via GitLocalize 2020-02-05 08:23:25 +00:00
Just Mango
5df2bc0edd Translate messages_vi.yml via GitLocalize 2020-02-05 02:19:43 +00:00
HSGamer
dbc3f7b492 Translate researches_vi.yml via GitLocalize 2020-02-05 02:16:43 +00:00
TheBusyBiscuit
916432c9ab [Ci skip] Added many more languages 2020-02-05 01:40:47 +01:00
András Marczinkó
1d85a7b56a Translate messages_hu.yml via GitLocalize 2020-02-04 22:28:40 +00:00
TheBusyBiscuit
f0a3ccc43c [CI skip] Reduced technical debt, improved performance, refactoring 2020-02-04 19:05:49 +01:00
TheBusyBiscuit
c37bb55bc5 Updated language files 2020-02-04 17:22:25 +01:00
TheBusyBiscuit
0ab4ca5a42
[CI skip] Merge pull request #1448 from TheBusyBiscuit/gitlocalize-10699 
Researches - Slovak language
 2020-02-04 17:21:09 +01:00
KillerXCoder
526afd1b04 Translate messages_sk.yml via GitLocalize 2020-02-04 14:19:56 +00:00
PixelHotDog
2c90117b34 Translate researches_sk.yml via GitLocalize 2020-02-04 14:18:44 +00:00
KillerXCoder
c553245c8f Translate researches_sk.yml via GitLocalize 2020-02-04 14:18:42 +00:00
TheBusyBiscuit
d6e174ca75
Merge pull request #1447 from TheBusyBiscuit/gitlocalize-10697 
Added german Researches
 2020-02-04 10:41:49 +01:00
TheBusyBiscuit
81a7725396 [Ci skip] Updated translators 2020-02-04 10:41:39 +01:00
TheBusyBiscuit
dc4a708057 Translate researches_de.yml via GitLocalize 2020-02-04 09:39:26 +00:00
daro2404
1fa8c7e3fc Translate researches_de.yml via GitLocalize 2020-02-04 09:36:21 +00:00
MeerBiene
825c992988 Translate researches_de.yml via GitLocalize 2020-02-04 09:36:19 +00:00
TheBusyBiscuit
e8f0d4a7a0 Translate researches_de.yml via GitLocalize 2020-02-04 09:36:17 +00:00
Pierre
17f63e2f27 Translate researches_fr.yml via GitLocalize 2020-02-03 23:53:51 +00:00
Dams_
4adc1a4e02 Translate researches_fr.yml via GitLocalize 2020-02-03 23:53:49 +00:00
TheBusyBiscuit
c952ac6477 [Ci skip] Minor UI update 2020-02-04 00:53:30 +01:00
TheBusyBiscuit
a44c6671ba Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-04 00:43:53 +01:00
TheBusyBiscuit
c1d885548a Languages now show their progress 2020-02-04 00:43:43 +01:00
Dams_
b320a1c340 Translate messages_fr.yml via GitLocalize 2020-02-03 23:32:41 +00:00
Edwin Kerforne
04016cc24a Translate messages_fr.yml via GitLocalize 2020-02-03 23:32:40 +00:00
Pierre
8f5656778f Translate messages_fr.yml via GitLocalize 2020-02-03 23:32:39 +00:00
TheBusyBiscuit
a864ddb59e Added Chinese (Taiwan) 2020-02-04 00:25:54 +01:00
TheBusyBiscuit
a15b32c964 Added Chinese (Taiwan) 2020-02-04 00:23:01 +01:00
TheBusyBiscuit
1fb420f7c0
[CI skip] Merge pull request #1444 from TheBusyBiscuit/gitlocalize-10691 
Added Chinese (Taiwan)
 2020-02-04 00:18:55 +01:00
TheBusyBiscuit
9d6767dfaa Translate messages_zh-TW.yml via GitLocalize 2020-02-03 23:15:46 +00:00
HeroBrineKing
2a59084b38 Translate messages_zh-TW.yml via GitLocalize 2020-02-03 23:15:44 +00:00
MIO.sh
082ea79108 Translate messages_zh-TW.yml via GitLocalize 2020-02-03 23:15:42 +00:00
HeroBrineKing
cf214a5bdb Translate researches_zh-TW.yml via GitLocalize 2020-02-03 23:12:03 +00:00
TheBusyBiscuit
cc8bb1bebb [Ci skip] Added SlimefunBranch enum 2020-02-03 23:09:32 +01:00
TheBusyBiscuit
2ab549f7a4 [Ci skip] Some small fixes 2020-02-03 22:52:19 +01:00
TheBusyBiscuit
f1c3b561f5
Merge pull request #1439 from TheBusyBiscuit/gitlocalize-10624 
Update translation
 2020-02-03 22:33:16 +01:00
TheBusyBiscuit
9266246e16 [Ci skip] Fixed swedish translation 2020-02-03 22:33:08 +01:00
TheBusyBiscuit
7abe781925
[Ci skip] Merge pull request #1440 from TheBusyBiscuit/gitlocalize-10625 
Update translation
 2020-02-03 22:31:16 +01:00
TheBusyBiscuit
1a902a902e
[CI skip] Merge pull request #1442 from TheBusyBiscuit/gitlocalize-10648 2020-02-03 22:30:13 +01:00
Turret
26f9c33d77 Translate researches_sv.yml via GitLocalize 2020-02-03 11:15:52 +00:00
Turret
3e322fe125 Translate messages_sv.yml via GitLocalize 2020-02-03 11:15:24 +00:00
Nameless
00bbccd6dc Translate messages_zh-CN.yml via GitLocalize 2020-02-03 05:14:20 +00:00
Nameless
069243aa89 Translate researches_zh-CN.yml via GitLocalize 2020-02-03 05:14:01 +00:00
TheBusyBiscuit
6f7f6c6323 Fixes #1438 2020-02-02 23:07:02 +01:00
Pierre
7267420c9c Translate messages_fr.yml via GitLocalize 2020-02-02 19:37:12 +00:00
TheBusyBiscuit
0bb8a11cd9 Fixes #1435 2020-02-02 20:20:57 +01:00
TheBusyBiscuit
7057e7fa53
Merge pull request #1433 from WalshyDev/patch-2 
Sync up cache stuff in BlockStorage
 2020-02-02 18:28:26 +01:00
TheBusyBiscuit
53345d0f8e Some refactoring + language updates 2020-02-02 18:27:32 +01:00
HSGamer
790068e0be Translate researches_vi.yml via GitLocalize 2020-02-02 16:10:27 +00:00
nahkd123
d8f9e35177 Translate researches_vi.yml via GitLocalize 2020-02-02 16:10:25 +00:00
Just Mango
cacae97738 Translate researches_vi.yml via GitLocalize 2020-02-02 16:10:23 +00:00
Julie-Sigtuna
c8373a65d3 Translate researches_vi.yml via GitLocalize 2020-02-02 16:10:22 +00:00
Daniel Walsh
99e8f5265a
Sync up cache stuff in BlockStorage 2020-02-02 16:01:47 +00:00
TheBusyBiscuit
b9986ff91b
[CI skip] Merge pull request #1432 from TheBusyBiscuit/gitlocalize-10619 
Looks correct
 2020-02-02 17:01:26 +01:00
TheBusyBiscuit
f870eea2a7 [Ci skip] Updated translators 2020-02-02 17:01:12 +01:00
Nouma
4f09086218 Translate researches_fr.yml via GitLocalize 2020-02-02 15:57:28 +00:00
Pierre
230cd061d9 Translate researches_fr.yml via GitLocalize 2020-02-02 15:57:26 +00:00
Dams_
a193fbda44 Translate researches_fr.yml via GitLocalize 2020-02-02 15:57:24 +00:00
Edwin Kerforne
2ef9beb082 Translate researches_fr.yml via GitLocalize 2020-02-02 15:57:22 +00:00
Just Mango
75849d440d Translate messages_vi.yml via GitLocalize 2020-02-02 15:53:55 +00:00
TheBusyBiscuit
548ec3fd6a [Ci skip] little fix 2020-02-02 16:37:59 +01:00
TheBusyBiscuit
437743558c Translate messages_de.yml via GitLocalize 2020-02-02 15:25:08 +00:00
TheBusyBiscuit
519d59e9c8 [CI skip] Added "unsupported language" to bStats Metrics 2020-02-02 16:22:41 +01:00
TheBusyBiscuit
b9c3d64735
[CI skip] Merge pull request #1429 from TheBusyBiscuit/gitlocalize-10616 
Polish translation for Slimefun4
 2020-02-02 16:11:33 +01:00
TheBusyBiscuit
21fe6b691a [Ci skip] Researches can now be translated 2020-02-02 16:11:18 +01:00
TheBusyBiscuit
b01ae9ba69 [CI skip] Added more translators 2020-02-02 15:43:41 +01:00
TheBusyBiscuit
b94c5ca55d [CI skip] Added researches to translatable files 2020-02-02 14:56:18 +01:00
kbartek05
805204fc64 Translate messages_pl.yml via GitLocalize 2020-02-02 11:23:46 +00:00
kbartek05
1c835cdd87 Translate messages_pl.yml via GitLocalize 2020-02-02 11:18:57 +00:00
machine-translation
abd60cb08e Translate messages_pl.yml via GitLocalize 2020-02-02 11:15:56 +00:00
Wirusiu
30de5f3355 Translate messages_pl.yml via GitLocalize 2020-02-02 11:15:54 +00:00
Paw
2ef0761d20 Translate messages_pl.yml via GitLocalize 2020-02-02 11:15:52 +00:00
kbartek05
4a8fe8fdcc Translate messages_pl.yml via GitLocalize 2020-02-02 11:15:50 +00:00
TheBusyBiscuit
aa5ab2f55e
Merge pull request #1427 from TheBusyBiscuit/gitlocalize-10613 
Added Russian
 2020-02-01 23:07:33 +01:00
TheBusyBiscuit
0b8d78c1f5 [Ci skip] Added russian translators 2020-02-01 23:07:21 +01:00
Костя
37a156a3a2 Translate messages_ru.yml via GitLocalize 2020-02-01 22:06:02 +00:00
SoSeDiK
9c42127287 Translate messages_ru.yml via GitLocalize 2020-02-01 22:06:00 +00:00
xXDOTTORXx
836311c78f Translate messages_it.yml via GitLocalize 2020-02-01 22:05:03 +00:00
András Marczinkó
86993d5957 Translate messages_hu.yml via GitLocalize 2020-02-01 15:05:08 +00:00
Edwin Kerforne
3c850cda63 Translate messages_fr.yml via GitLocalize 2020-02-01 11:21:47 +00:00
Pierre
b13796aeb3 Translate messages_fr.yml via GitLocalize 2020-02-01 11:21:46 +00:00
Dams_
07b0ac5159 Translate messages_fr.yml via GitLocalize 2020-02-01 11:21:45 +00:00
KillerXCoder
89241a303f Translate messages_sk.yml via GitLocalize 2020-02-01 11:18:01 +00:00
TheBusyBiscuit
a7c1b3a72f [Ci skip] Added StarWishsamas skin 2020-02-01 12:00:12 +01:00
TheBusyBiscuit
8216eecc21
Merge pull request #1419 from TheBusyBiscuit/gitlocalize-10599 
Added Vietnamese
 2020-02-01 11:08:44 +01:00
TheBusyBiscuit
4fd6647cfd [Ci skip] Prepare Vietnamese 2020-02-01 11:08:35 +01:00
Just Mango
742555a6f0 Translate messages_vi.yml via GitLocalize 2020-02-01 10:06:55 +00:00
HSGamer
15659adff8 Translate messages_vi.yml via GitLocalize 2020-02-01 10:06:54 +00:00
TheBusyBiscuit
2e2639e89f
Merge pull request #1418 from TheBusyBiscuit/gitlocalize-10597 
Added Chinese (China)
 2020-02-01 10:56:05 +01:00
TheBusyBiscuit
4b13cc4436
Merge pull request #1417 from TheBusyBiscuit/gitlocalize-10595 
Added Dutch
 2020-02-01 10:55:59 +01:00
TheBusyBiscuit
4a5eea2f03 [Ci skip] Updated translators 2020-02-01 10:55:46 +01:00
Nameless
fc4560adbb Translate messages_zh-CN.yml via GitLocalize 2020-02-01 09:54:00 +00:00
Senne Van Rompaey
3bd5de0ec5 Translate messages_nl.yml via GitLocalize 2020-02-01 09:47:42 +00:00
Dr4gonD
74e3cb38d1 Translate messages_nl.yml via GitLocalize 2020-02-01 09:47:40 +00:00
TheBusyBiscuit
ea3c95c92c Added 5 new languages; removed some old code 2020-02-01 09:57:38 +01:00
TheBusyBiscuit
8dfd9879f6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-02-01 09:46:25 +01:00
TheBusyBiscuit
37d9f021cf [Ci skip] Unlocked 5 more languages 2020-02-01 09:46:08 +01:00
Luu7
cd3a7aa429 Translate messages_es.yml via GitLocalize 2020-02-01 01:55:39 +00:00
Vravinite
a063204c7e Translate messages_es.yml via GitLocalize 2020-02-01 01:55:38 +00:00
TheBusyBiscuit
354ad2fc35 Translate messages_de.yml via GitLocalize 2020-02-01 00:44:23 +00:00
TheBusyBiscuit
6fa0850fc2 [ci skip] little change 2020-02-01 01:41:54 +01:00
TheBusyBiscuit
ea26ac49b1 Ree... Reeeee... Reeeeeeeee... REFACTORING 
(let's hope I didn't break anything)
 2020-02-01 01:32:38 +01:00
TheBusyBiscuit
73d17fd3d9 Little fix 2020-01-31 21:26:20 +01:00
TheBusyBiscuit
1b1a04cb1c Fixed swedish translation of "swedish" :kappa: 2020-01-31 21:24:04 +01:00
TheBusyBiscuit
dada3e37a0 Added Italian, Spanish, Swedish, Hungarian, Latvian and Slovak 2020-01-31 19:54:50 +01:00
TheBusyBiscuit
b02f59b6b6
[CI skip] Merge pull request #1413 from TheBusyBiscuit/gitlocalize-10590 
Added Hungarian
 2020-01-31 19:36:48 +01:00
TheBusyBiscuit
9815089619
[Ci skip] Merge pull request #1414 from TheBusyBiscuit/gitlocalize-10591 
Added Swedish
 2020-01-31 19:35:18 +01:00
TheBusyBiscuit
3204fc2d2c
[Ci skip] Merge pull request #1412 from TheBusyBiscuit/gitlocalize-10589 
Added Slovak
 2020-01-31 19:34:55 +01:00
TheBusyBiscuit
05af9b4217
[Ci skip] Merge pull request #1411 from TheBusyBiscuit/gitlocalize-10588 
Updated French
 2020-01-31 19:33:58 +01:00
TheBusyBiscuit
2897bc4a4e
[CI skip] Merge pull request #1410 from TheBusyBiscuit/gitlocalize-10587 
Added Spanish
 2020-01-31 19:33:43 +01:00
TheBusyBiscuit
4a681e6629
[CI skip] Merge pull request #1407 from TheBusyBiscuit/gitlocalize-10582 
Added Latvian
 2020-01-31 19:32:15 +01:00
TheBusyBiscuit
f32b00f585
[CI skip] Merge pull request #1406 from TheBusyBiscuit/gitlocalize-10579 
Added Italian
 2020-01-31 19:31:59 +01:00
TheBusyBiscuit
d566add2fa Translate messages_sv.yml via GitLocalize 2020-01-31 18:30:33 +00:00
Turret
7cef888134 Translate messages_sv.yml via GitLocalize 2020-01-31 18:30:31 +00:00
NihilistBrew
858dbdd902 Translate messages_sv.yml via GitLocalize 2020-01-31 18:30:29 +00:00
TheBusyBiscuit
6c29328a48 Translate messages_hu.yml via GitLocalize 2020-01-31 18:29:08 +00:00
András Marczinkó
727535f308 Translate messages_hu.yml via GitLocalize 2020-01-31 18:29:06 +00:00
PixelHotDog
6ec5f2dee2 Translate messages_sk.yml via GitLocalize 2020-01-31 18:26:42 +00:00
KillerXCoder
c7c68e24c3 Translate messages_sk.yml via GitLocalize 2020-01-31 18:26:39 +00:00
Dams_
f7b00fa3d1 Translate messages_fr.yml via GitLocalize 2020-01-31 18:25:02 +00:00
dbzjjoe
8b46e30e5d Translate messages_es.yml via GitLocalize 2020-01-31 18:24:49 +00:00
NotUmBr4
600762492c Translate messages_es.yml via GitLocalize 2020-01-31 18:24:47 +00:00
Vravinite
4128380e93 Translate messages_es.yml via GitLocalize 2020-01-31 18:24:45 +00:00
Luu7
d66be088dc Translate messages_es.yml via GitLocalize 2020-01-31 18:24:43 +00:00
AgnisT
afda7bb773 Translate messages_lv.yml via GitLocalize 2020-01-31 12:01:27 +00:00
TheBusyBiscuit
c8553a161b [Ci skip] Added a new translator 2020-01-31 11:14:50 +01:00
TheBusyBiscuit
c5a2376694 Translate messages_it.yml via GitLocalize 2020-01-31 10:13:15 +00:00
xXDOTTORXx
ad25fa7531 Translate messages_it.yml via GitLocalize 2020-01-31 10:13:13 +00:00
machine-translation
2821597e2a Translate messages_it.yml via GitLocalize 2020-01-31 10:13:11 +00:00
TheBusyBiscuit
1818da5cce [Ci skip] Forgot one thing 2020-01-31 09:53:13 +01:00
TheBusyBiscuit
a0d9e215fc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-01-31 09:47:54 +01:00
TheBusyBiscuit
f0f3740a2c [CI skip] Minor refactoring 2020-01-31 09:47:04 +01:00
TheBusyBiscuit
1cc8b530a4
[CI skip] Merge pull request #1405 from TheBusyBiscuit/gitlocalize-10576 
Updated german translation
 2020-01-31 09:34:38 +01:00
TheBusyBiscuit
48589284bb Translate messages_de.yml via GitLocalize 2020-01-31 08:19:51 +00:00
TheBusyBiscuit
4cca09f6c9 [CI skip] Added a few more flags 2020-01-31 09:18:14 +01:00
TheBusyBiscuit
7423f579f4 Translate messages_de.yml via GitLocalize 2020-01-31 00:03:55 +00:00
TheBusyBiscuit
1db1168c09 [CI skip] Added more future language names 2020-01-31 00:59:36 +01:00
TheBusyBiscuit
704d3f47fa Fixed Minecraft recipes not showing correctly 2020-01-31 00:33:05 +01:00
TheBusyBiscuit
59abc2f2e2 Added french translation 2020-01-31 00:25:01 +01:00
TheBusyBiscuit
0ce71eab7f
Merge pull request #1404 from TheBusyBiscuit/gitlocalize-10575 
Added french translation
 2020-01-31 00:18:32 +01:00
TheBusyBiscuit
268f39cccd [Ci skip] Preparing for the french... 2020-01-31 00:18:19 +01:00
tnthomastn
26374ea5f7 Translate messages_fr.yml via GitLocalize 2020-01-30 23:10:39 +00:00
Dams_
828ad624fb Translate messages_fr.yml via GitLocalize 2020-01-30 23:10:37 +00:00
Edwin Kerforne
3f75d6fa37 Translate messages_fr.yml via GitLocalize 2020-01-30 23:10:36 +00:00
TheBusyBiscuit
6b7435a181 [CI skip] Added french translators 2020-01-31 00:09:57 +01:00
TheBusyBiscuit
800bd01688 Translate messages_de.yml via GitLocalize 2020-01-30 22:50:57 +00:00
TheBusyBiscuit
3bdaf04c88 Fixed wrong file encodings 2020-01-30 23:48:40 +01:00
TheBusyBiscuit
e05edcc7f0
Merge pull request #1402 from TheBusyBiscuit/gitlocalize-10572 
Added german translation
 2020-01-30 23:19:54 +01:00
TheBusyBiscuit
aa3007ef0a [Ci skip] Little preparation 2020-01-30 23:19:42 +01:00
TheBusyBiscuit
e5ce53f906 Translate messages_de.yml via GitLocalize 2020-01-30 21:50:14 +00:00
TheBusyBiscuit
761d52a9c6 Slimefun can now be translated (see wiki) 2020-01-30 22:03:17 +01:00
TheBusyBiscuit
911aa64e32
[CI skip] Added italian 2020-01-30 20:53:28 +01:00
TheBusyBiscuit
6dc0907728 [CI skip] Reduced technical debt 2020-01-29 02:25:25 +01:00
TheBusyBiscuit
b94e197f06 Fixes #1396 2020-01-28 23:42:05 +01:00
TheBusyBiscuit
2133f528a9 Possibly fixes #1313 + Performance Improvements 2020-01-28 23:36:28 +01:00
TheBusyBiscuit
1f672905d2 Fixes #1394 2020-01-28 21:05:45 +01:00
TheBusyBiscuit
4882c7e4cc Super extreme ultra mega refactor 3000 2020-01-27 01:05:28 +01:00
TheBusyBiscuit
9f07d6b8c1 Fixes #1385 2020-01-26 11:05:37 +01:00
TheBusyBiscuit
06558541f3 Added #1387 to CHANGELOG.md 2020-01-26 03:15:10 +01:00
TheBusyBiscuit
20af3fc8ed
[CI skip] Merge pull request #1387 from BigBadE/master 
Added support for furnaces and brewing stands to cargo nets.
 2020-01-26 03:08:23 +01:00
bigbade
83b97384b7 Fixed bad return 2020-01-25 20:04:01 -08:00
bigbade
f5e6a4fcad Removed random import 2020-01-25 19:04:00 -08:00
bigbade
38b2bab35b Removed debug statement 2020-01-25 18:44:31 -08:00
bigbade
9c8d65d654 Added support for furnaces and brewing stands to cargo nets. 2020-01-25 18:40:01 -08:00
TheBusyBiscuit
44e3fad238 [CI skip] Removed some old code 2020-01-25 19:09:49 +01:00
bigbade
669a999d01 Added comments, switched return for MagicSugar, and made MagicSugar ancient altar check pass on any dispensers/enchantment tables. 2020-01-25 09:09:58 -08:00
TheBusyBiscuit
47b0ae5d9b Finalized Merging of Pull Request #1382 2020-01-25 17:16:16 +01:00
TheBusyBiscuit
4c58e61fcc
[CI skip] Merge pull request #1382 from BigBadE/master 
Small bug fixing
 2020-01-25 17:11:22 +01:00
TheBusyBiscuit
53be0a1842 Fixed Network Particles and added a max-nodes config option 2020-01-25 14:20:58 +01:00
TheBusyBiscuit
81b80643d3 [Ci skip] Refactoring 2020-01-25 13:36:36 +01:00
TheBusyBiscuit
2d9df90b1b [Ci skip] Minor refactoring 2020-01-25 13:11:04 +01:00
bigbade
71d4b74d72 Null checking is a good idea. 2020-01-24 19:58:10 -08:00
bigbade
4145eeb82d Fixed formatting 2020-01-24 19:43:56 -08:00
bigbade
e49f7de412 Allowed MagicSugar to be placed on Altars. 2020-01-24 19:42:15 -08:00
bigbade
e2ff5b2b09 Fixed DebugFishListener casting BlockData of wall skulls to Rotatable instead of Directional. 2020-01-24 19:07:41 -08:00
TheBusyBiscuit
623e5a2f02 [CI skip] Refactored default-languages 2020-01-21 14:37:19 +01:00
NihilistBrew
27086b4775
Change typo 2020-01-19 15:13:20 +01:00
NihilistBrew
fbf8907181
Additional formatting 2020-01-19 12:19:13 +01:00
NihilistBrew
27b8f53db9
Normalize formatting of SlimefunSetup.java 2020-01-18 09:45:48 +01:00
TheBusyBiscuit
73b64e874e Added more message strings, Elevators now support multiple pages 2020-01-14 20:48:04 +01:00
TheBusyBiscuit
6b53679715 Added support for multiple pages to the Elevator 2020-01-14 02:10:20 +01:00
TheBusyBiscuit
53efbf9612 [CI skip] Some more optimizations 2020-01-12 18:39:06 +01:00
TheBusyBiscuit
08f25c58a9 Performance improvements and some cleanup 2020-01-12 18:10:09 +01:00
TheBusyBiscuit
b6ca510094
[Ci skip] Merge pull request #1368 from J3fftw1/Feature/added-string 
added string to BioGenerator
 2020-01-12 16:04:42 +01:00
Panda.com
0aebfdef8a removed unused import 2020-01-12 15:36:01 +01:00
Panda.com
1ba2fd2f29 added prismarine to grindestone 2020-01-12 15:35:17 +01:00
Panda.com
eff7e9581f added string to BioGenerator 2020-01-12 15:21:33 +01:00
TheBusyBiscuit
d28487f103 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-01-12 13:14:56 +01:00
TheBusyBiscuit
8a267cad3e Fixes #1364 2020-01-12 13:14:41 +01:00
Senne Van Rompaey
e3f0882415
Update wiki.json 
Add Auto-Panning-Machine, compressor, ore-washer, pressure-chamber, grind-stone and magic-workbench
 2020-01-12 13:04:57 +01:00
TheBusyBiscuit
51dfbaed8a Improved performance for GEO Miner and Oil Pump 2020-01-12 11:52:20 +01:00
TheBusyBiscuit
7c993ead57 [CI skip] Refactoring 2020-01-12 11:05:35 +01:00
TheBusyBiscuit
fe6caccee9 [CI skip] More refactoring 2020-01-12 11:01:29 +01:00
TheBusyBiscuit
b94121e55b Fixes #1366 2020-01-12 10:27:56 +01:00
TheBusyBiscuit
626a2ebdaf Refactoring, lots of refactoring 2020-01-12 02:05:33 +01:00
TheBusyBiscuit
1cbe3f9e1f A lot more refactoring and cleanup 2020-01-12 01:44:57 +01:00
TheBusyBiscuit
74f33764ad [CI skip] Added a "language" variable for PlaceholderAPI 2020-01-12 00:15:40 +01:00
TheBusyBiscuit
b715de5a5c [Ci skip] Reduced technical debt 2020-01-12 00:10:19 +01:00
TheBusyBiscuit
7bde982b8b [CI skip] More refactoring 2020-01-12 00:02:07 +01:00
TheBusyBiscuit
ffc0fe41f0 [CI skip] Refactoring 2020-01-11 23:58:05 +01:00
TheBusyBiscuit
55269d587c Added even more localization options 2020-01-11 23:03:35 +01:00
Daniel Walsh
90fadd27be [CI skip] New fortune cookie message (#1365) 2020-01-11 22:13:50 +01:00
TheBusyBiscuit
d1a6f0c61c Added more stuff to the messages.yml 2020-01-11 22:07:14 +01:00
TheBusyBiscuit
67bf0f9f47 [CI skip] Thanks git... 2020-01-11 20:58:14 +01:00
TheBusyBiscuit
a50756ccb2 [CI skip] Refactoring + very small performance optimization for androids 2020-01-11 20:56:33 +01:00
TheBusyBiscuit
86ec4e17ac Fix indentation 2020-01-11 20:20:49 +01:00
TheBusyBiscuit
2e7df8acd2 Minor fix 2020-01-11 20:17:12 +01:00
TheBusyBiscuit
2dfb9ce92a Refined and refactored Localization code 2020-01-11 20:12:53 +01:00
TheBusyBiscuit
be0035f2f9 Build 400 - Players can now select their language 2020-01-10 22:40:36 +01:00
TheBusyBiscuit
8735a8e1a3 [Ci skip] Super secret feature 2020-01-10 21:43:49 +01:00
TheBusyBiscuit
13110a4927 Added gitlocalize 2020-01-10 16:25:10 +01:00
TheBusyBiscuit
6207b6348a Refactoring 2020-01-10 00:13:01 +01:00
TheBusyBiscuit
3fa4e1615e [CI skip] Minor refactoring 2020-01-09 23:43:30 +01:00
TheBusyBiscuit
c375384288 Removed Solar Array 2020-01-09 23:34:06 +01:00
TheBusyBiscuit
66b573e10e Fixes #1355 2020-01-09 23:33:11 +01:00
BurningBrimstone
1f6cd506f6 [CI skip] Wiki.json Update (#1359) 
* Added all Technical Components

* Update wiki.json

Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2020-01-09 16:13:12 +01:00
Senne Van Rompaey
3d520ad9f1 [Ci skip] Add wiki references (#1357) 
Add wiki references for the entire Hazmat Suit, Armor Forge and Ore Crusher.
 2020-01-07 16:22:59 +01:00
TheBusyBiscuit
abcd579323 Removed old and deprecated API (Addons should all have switched over...) 2020-01-06 22:48:14 +01:00
TheBusyBiscuit
ec409886a6 Another try... Pushing this to stable! 2020-01-06 20:04:39 +01:00
TheBusyBiscuit
cb73d37ed6 [CI skip] Added Fuffles_ to the contributors list. 2020-01-06 00:35:39 +01:00
TheBusyBiscuit
9033df4a16 Reworked Guide Settings (again) and reverted last change 2020-01-05 23:32:59 +01:00
TheBusyBiscuit
c05f604d4f Fixes #1354 2020-01-05 21:50:17 +01:00
TheBusyBiscuit
ff6f160138 Updated Ore Crusher Recipes 2020-01-05 21:49:21 +01:00
TheBusyBiscuit
9ff093affa Oil Pump now shows its "Bucket -> Oil" recipe. 2020-01-05 14:30:50 +01:00
TheBusyBiscuit
1f7e03a270 Possibly fixes #1346 and other concurrency issues 2020-01-04 16:51:25 +01:00
TheBusyBiscuit
e5fd1ad5b4 Fixed Iron Golems being repaired with slimefun ingots 2020-01-04 16:32:23 +01:00
TheBusyBiscuit
2409978b1d Fixes #1332 2020-01-04 16:29:15 +01:00
TheBusyBiscuit
23a51b898e A lot more refactoring + technical debt reduction + minor optimizations 2020-01-04 15:40:45 +01:00
TheBusyBiscuit
3c32ca6c60 Some cleanup 2020-01-04 13:55:33 +01:00
TheBusyBiscuit
6bae1098bc Fixes #1344 2020-01-03 16:59:11 +01:00
TheBusyBiscuit
69267983b9 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-01-03 16:36:09 +01:00
TheBusyBiscuit
95adc66536 Fixed two small issues and did some cleanup 2020-01-03 16:35:55 +01:00
TheBusyBiscuit
e0b240f570 Reduced technical debt 2020-01-03 16:33:58 +01:00
penta
343342e739 Added more wiki entries (#1331) 2020-01-03 14:45:44 +01:00
TheBusyBiscuit
5b86ef1e7e
Merge pull request #1339 from mohkamfer/AutomatedCraftingChamberCraftLast 
Enable Automated Crafting Chamber To Craft Last Shaped Recipe
 2020-01-03 14:42:57 +01:00
TheBusyBiscuit
89d55430fb Radioactive items have a new lore! 2020-01-03 14:41:15 +01:00
TheBusyBiscuit
1b0d507783 Updated Radioactive - lore. You may need to convert some items... 2020-01-03 13:57:56 +01:00
Muhammad Kamal
667ec595ee Refactor getSerializsedInput()'s if conditions 2020-01-03 14:52:34 +02:00
Muhammad Kamal
e8a79a7c3a Refactor tick()'s if condition 2020-01-03 14:50:02 +02:00
TheBusyBiscuit
34a56a1bb6 Simplified some lore utilities 2020-01-03 13:33:21 +01:00
Muhammad Kamal
fc007273bb Fix ItemStack Amounts Greater Than 1 2020-01-03 14:10:32 +02:00
Muhammad Kamal
9d246adf93 Reformat Code 2020-01-03 14:04:43 +02:00
TheBusyBiscuit
84604752e3 [CI skip] Little file size optimization I guess? 2020-01-03 02:20:36 +01:00
Muhammad Kamal
f8c2983491 Enable Automated Crafting Chamber To Craft Last Shaped Recipe 2020-01-01 00:02:47 +02:00
TheBusyBiscuit
3773460561 Fixes #1337 2019-12-30 01:25:05 +01:00
TheBusyBiscuit
e90b8c18f7 [CI skip] Reduced technical debt 2019-12-30 01:21:47 +01:00
TheBusyBiscuit
b74479327a [CI skip] Reduced technical debt 2019-12-30 01:18:09 +01:00
TheBusyBiscuit
1c0e36f6f1 [CI skip] Optimized and refactored some android code 2019-12-30 01:01:09 +01:00
TheBusyBiscuit
a817903a04 [CI skip] Updated dependencies 2019-12-29 22:13:00 +01:00
TheBusyBiscuit
b8a94e22e5 [CI skip] Some refactoring 2019-12-29 18:30:48 +01:00
TheBusyBiscuit
e2d58f7f50 Several changes, won't list em all 2019-12-29 14:14:51 +01:00
TheBusyBiscuit
8db990f56c [CI skip] Fixed pages for main menu 2019-12-29 00:05:30 +01:00
TheBusyBiscuit
39292ae9ce Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-28 12:43:01 +01:00
TheBusyBiscuit
784ad0b195 Fixes #1295 2019-12-28 12:42:39 +01:00
AlexLander123
586437b16d Fix Basic Circuit Board not dropping 2019-12-28 14:35:39 +08:00
TheBusyBiscuit
8b3d1fedcb [CI skip] Minor tweaks 2019-12-27 16:43:23 +01:00
TheBusyBiscuit
9a3d79781b [CI skip] Reduced technical debt 2019-12-27 11:38:54 +01:00
TheBusyBiscuit
687e97f8e9 Minecraft recipe will now scroll through all available items (e.g. wood) 2019-12-27 11:10:22 +01:00
TheBusyBiscuit
2a06c2e215 Slimefun Guide now shows ALL minecraft recipes, with pages 2019-12-27 02:16:01 +01:00
TheBusyBiscuit
5dc19aedc3 [CI skip] Excluded github-actions from the contributors list 2019-12-26 23:30:28 +01:00
TheBusyBiscuit
3a19350323 Added Kelp Cookies (because why not?) 2019-12-26 21:26:04 +01:00
TheBusyBiscuit
336b26759a [CI skip] Some minor changes 2019-12-26 21:10:03 +01:00
TheBusyBiscuit
f7bfff2f37 Players can now toggle their research-fireworks in the guide 2019-12-26 21:01:51 +01:00
TheBusyBiscuit
d2ac50be38 Overhauled Guide Settings 2019-12-26 20:52:15 +01:00
TheBusyBiscuit
b7776e73b4 Minor performance improvement 2019-12-26 20:29:20 +01:00
TheBusyBiscuit
4efb53b705 Minor changes 2019-12-26 20:22:28 +01:00
TheBusyBiscuit
5933bc6367 Reduced technical debt 2019-12-26 19:56:58 +01:00
TheBusyBiscuit
249af4001b Fixes #1325 2019-12-26 19:49:53 +01:00
TheBusyBiscuit
7183350e1a Some code cleanup 2019-12-26 18:36:21 +01:00
TheBusyBiscuit
0efc51c7ea Fixed Category constructor 2019-12-26 18:30:40 +01:00
TheBusyBiscuit
129b98dff6 Lots of refactoring, implemented a suggestion 2019-12-23 20:38:55 +01:00
TheBusyBiscuit
bd610a9f94 Fixes #1298 2019-12-23 19:39:35 +01:00
TheBusyBiscuit
0e0859e73a [CI skip] Another minecraft alias 2019-12-23 00:39:03 +01:00
TheBusyBiscuit
2edf5db140 [CI skip] Added bverhoevens and BurningBrimstones minecraft alias 2019-12-22 23:51:43 +01:00
TheBusyBiscuit
b5dd2f329a [CI skip] Reduced technical debt, lots of refactoring 2019-12-22 23:00:05 +01:00
TheBusyBiscuit
5a0b994a4f Fixes #1318 2019-12-22 14:03:52 +01:00
TheBusyBiscuit
997c682a00 Refactoring + Allowed custom models for UI elements 2019-12-22 14:00:35 +01:00
coco0325
2ceb9d6d45 Update OilPump.java 2019-12-22 17:08:44 +08:00
coco0325
4d63bffc72 Update OilPump.java 2019-12-22 15:31:53 +08:00
coco0325
87b8035b34 Corrected OliPump.java 2019-12-22 01:46:56 +08:00
coco0325
ff0016ad0e Update OilPump.java 2019-12-22 01:32:20 +08:00
coco0325
2fd2dae403 Revert "TW-1" 
This reverts commit 687516cfae.
 2019-12-22 01:18:12 +08:00
coco0325
7d0d222f79 Update OilPump.java 2019-12-22 01:16:43 +08:00
coco0325
060051623d Merge remote-tracking branch 'upstream/master' 2019-12-22 01:08:49 +08:00
coco0325
687516cfae TW-1 2019-12-22 01:07:58 +08:00
TheBusyBiscuit
bee2375757 Removed Nether Drill (+ some micro-optimizations) 2019-12-21 16:46:17 +01:00
TheBusyBiscuit
c1ba8c02b3 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-21 15:42:29 +01:00
TheBusyBiscuit
429c280095 Fixes #1316 2019-12-21 15:42:07 +01:00
TheBusyBiscuit
6ef858a6ee
[CI skip] Merge pull request #1312 from pentabulge/master 
Added more wiki entries
 2019-12-19 23:42:45 +01:00
TheBusyBiscuit
a89b9ff467 [CI skip] Fine, I'll do it myself, Thanos said 2019-12-19 23:26:40 +01:00
TheBusyBiscuit
97d72e0a8d
[CI skip] Merge pull request #1294 from BurningBrimstone/master 
Added recipes
 2019-12-19 23:25:03 +01:00
TheBusyBiscuit
f9b12dfed5 [CI skip] Improved Cargo Performance a lot (breaks Barrels though) 2019-12-19 23:22:09 +01:00
penta
f9ef602982 Added more wiki entries 2019-12-18 19:40:03 +01:00
TheBusyBiscuit
f7fa6e2972 [CI skip] Reduced technical debt and tweaked Magnesium Salt 2019-12-18 01:07:04 +01:00
TheBusyBiscuit
331b9b64a7
[CI skip] Merge pull request #1310 from J3fftw1/feature/gravel-to-sand 
added a way to automate sand production
 2019-12-17 23:08:19 +01:00
J3fftw1
b1ae5c9047 added a way to automate sand production 2019-12-17 23:03:56 +01:00
TheBusyBiscuit
33adb7e79a Added Magnesium Salt and Magnesium-powered Generator 2019-12-17 01:37:09 +01:00
TheBusyBiscuit
59fb83e871 [CI skip] Removed CS-CoreLib Auto-Installer and reduced technical debt 2019-12-17 00:44:41 +01:00
TheBusyBiscuit
5730907da3
Merge pull request #1308 from creator3/master 
Fix drops in 1.15
 2019-12-17 00:19:10 +01:00
TheBusyBiscuit
989ed45a02 Added Salt to the GEO Miner (and reduced technical debt) 2019-12-17 00:18:04 +01:00
creator3
d698840e1f Use the actual tool item in calls to getDrops() 2019-12-16 11:47:47 -05:00
creator3
8b177df6c8 Fix drops in 1.15 2019-12-16 11:21:31 -05:00
penta
66b44f20df
Update wiki.json 2019-12-12 16:47:07 +01:00
penta
04a202d9a4
Added more wiki entries 2019-12-12 14:05:43 +01:00
TheBusyBiscuit
7268fb0505 [CI skip] Some more refactoring 2019-12-12 02:52:24 +01:00
TheBusyBiscuit
7cb0c521f6 [CI skip] Some refactoring 2019-12-12 01:45:55 +01:00
TheBusyBiscuit
aa9652cf88 Fixed Credits erroring for invalid usernames 2019-12-12 00:22:00 +01:00
TheBusyBiscuit
a91d926698 Re-formatted pom.xml 2019-12-12 00:20:01 +01:00
TheBusyBiscuit
db5f10ffe8 Fixed Credits + Reduced technical debt 2019-12-12 00:16:28 +01:00
TheBusyBiscuit
d66d34e85b
Merge branch 'master' into support/1.15 2019-12-11 23:15:33 +01:00
TheBusyBiscuit
3976e427a0 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-11 23:14:25 +01:00
TheBusyBiscuit
1ee411e4ca [CI skip] Reduced and Increased technical debt 2019-12-11 23:13:51 +01:00
Daniel Walsh
32be167679 Support 1.15 2019-12-11 16:41:00 +00:00
BurningBrimstone
642f5fe464
Added Ore Block Recipes 
Added following recipes to the electric press:
Diamond -> Diamond Block
Redstone -> Redstone Block
Lapis -> Lapis Block
Gold -> Gold Block
Iron -> Iron Block
 2019-12-11 00:56:19 -05:00
TheBusyBiscuit
460270f2a9
Merge pull request #1292 from SoSeDiK/kt 
Reworked & Fixed Knowledge Tome and a minor researching tweak
 2019-12-10 11:27:33 +01:00
TheBusyBiscuit
f74c078f61
Merge pull request #1293 from NihilistBrew/patch-1 
Grind andesite, granite, diorite to gravel
 2019-12-10 11:26:57 +01:00
TheBusyBiscuit
fd8a77dd79
Merge pull request #1288 from ramdon-person/patch-1 
Added Soulbound Trident
 2019-12-10 11:26:44 +01:00
TheBusyBiscuit
cdef18c8d7 [CI skip] Little improvement 2019-12-10 11:21:09 +01:00
TheBusyBiscuit
4c593760ba [CI skip] Some minor changes to metrics 2019-12-10 11:10:53 +01:00
TheBusyBiscuit
c8cc7818b2 [CI skip] Added two more contributor names, some refactoring 2019-12-10 11:00:04 +01:00
SoSeDiK
ac80575d8f Optimized item check 2019-12-10 09:55:56 +02:00
ramdon_person
052f80eeac
Update SlimefunSetup.java 2019-12-09 23:24:51 -08:00
BurningBrimstone
c879e5ebb7
Updated Quartz Namespace ID 
Changed NETHER_QUARTZ to QUARTZ.
 2019-12-09 13:19:09 -05:00
BurningBrimstone
60f16ee4ac
Added recipes 
Added recipes for iron and gold nuggets into their respective ingots. Also added a recipe for quartz into quartz blocks.

https://discordapp.com/channels/565557184348422174/627048923122499584/652563773793763343
 2019-12-09 12:40:51 -05:00
NihilistBrew
3d8add777a
Grind andesite, granite, diorite to gravel 
From https://discordapp.com/channels/565557184348422174/565569155848208404/650406015246008339
 2019-12-09 16:50:25 +01:00
TheBusyBiscuit
6c4c9cdc17 Some minor optimization 2019-12-09 09:52:49 +01:00
SoSeDiK
f0d04c75d8 Removed unnecessary action 2019-12-08 23:12:11 +02:00
SoSeDiK
27a8aa6236 Tweaked instant researching 
Don't start researching when it's instant, just throw fireworks & message about completion
 2019-12-08 22:55:17 +02:00
SoSeDiK
ce5ca5146e Reworked Knowledge Tome 2019-12-08 22:45:03 +02:00
SoSeDiK
912d2e9d7f
Fixed duplicate Grind Stone recipes 2019-12-08 17:44:02 +02:00
SoSeDiK
9b5bcfde44 Updated Crucible's mechanics 2019-12-08 15:24:22 +02:00
TheBusyBiscuit
ec44688459 Improved SlimefunItemStack#clone() 2019-12-08 13:09:15 +01:00
TheBusyBiscuit
8e72577974 Another optimization 2019-12-08 13:03:01 +01:00
TheBusyBiscuit
021bb3cbc8 Item optimizations 2019-12-08 12:59:55 +01:00
TheBusyBiscuit
39082938a8 Optimized items even further 2019-12-08 12:58:50 +01:00
TheBusyBiscuit
a22068b9ff Optimized SlimefunManager.isItemSimilar 2019-12-08 12:58:05 +01:00
TheBusyBiscuit
4699d6b94d [Ci skip] Another little change 2019-12-08 10:48:41 +01:00
TheBusyBiscuit
d12253c2f2 [Ci skip] Some small changes 2019-12-08 10:07:51 +01:00
TheBusyBiscuit
e5da69eb30
Merge pull request #1287 from WalshyDev/fix/contributors 
Allow for different GH and MC names + small improvements
 2019-12-08 09:31:06 +01:00
ramdon_person
17cf8cecdc
Update ResearchSetup.java 2019-12-07 12:30:38 -08:00
ramdon_person
c48cf894d4
Update SlimefunSetup.java 2019-12-07 11:56:11 -08:00
coder4321
4b8c948ad6
Update SlimefunSetup.java 2019-12-07 10:11:16 -08:00
coder4321
2281393a8b
Update SlimefunSetup.java 2019-12-07 10:09:50 -08:00
Daniel Walsh
f1ee2bd092 Added @NihilistBrew 2019-12-07 12:59:56 +00:00
coder4321
05f2751d58
Added Soulbound Trident 2019-12-07 01:25:34 -08:00
TheBusyBiscuit
72916b3e4f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-07 10:05:11 +01:00
TheBusyBiscuit
f25bf75d67 Added Nether Gold Pan to the Electric Gold Pan 2019-12-07 10:04:54 +01:00
coder4321
f90f1c609f [CI skip] Updated Teleport Sounds and Fixed The “color codes are supported text” for elevators (#1283) 
* Update TeleportationSequence.java

* Update TeleportationSequence.java

* Update Elevator.java
 2019-12-07 09:41:26 +01:00
Daniel Walsh
cafc78b3fe Revert 5b9e9a4fb7 2019-12-06 21:47:18 +00:00
Daniel Walsh
5b9e9a4fb7 *screams internally* 2019-12-06 21:45:06 +00:00
Daniel Walsh
9156d478ef Add ajan-12 and LinoxGH 2019-12-06 21:35:17 +00:00
Daniel Walsh
3f179f9eaa oops, revert dis 2019-12-06 21:03:56 +00:00
Daniel Walsh
724c550204 Pasting is a true gem 2019-12-06 20:57:17 +00:00
Daniel Walsh
73a9eddf7f Fixed up 
Now doesn't accept special chars and added imgbot
 2019-12-06 20:56:03 +00:00
Daniel Walsh
a112e43b42 Allow for different GH and MC names + small improvements 2019-12-06 20:08:20 +00:00
TheBusyBiscuit
a29016a391
[CI skip] Added more wiki entries 2019-12-06 14:41:01 +01:00
TheBusyBiscuit
bcbe16253e Search now shows the Category of an Item 2019-12-06 14:20:42 +01:00
TheBusyBiscuit
43033ec3a4
Fixes #1280 2019-12-06 08:39:43 +01:00
SoSeDiK
a294e0db1f
Fixes #1281 2019-12-04 17:57:38 +02:00
SoSeDiK
732ae5e0dc
Added a new constructor 
Allows using the new item system.
 2019-12-04 13:35:08 +02:00
TheBusyBiscuit
da1dd294f6 Fixed Output Chest 2019-12-04 00:04:34 +01:00
TheBusyBiscuit
0fd7892ca4 Fixed blocks turning into CSCoreLib heads for all newly placed 
non-ticking blocks.
 2019-12-03 20:20:33 +01:00
TheBusyBiscuit
ae2a75b1d1
[CI skip] Merge pull request #1263 from poma123/patch-1 
AndroidMineEvent
 2019-12-03 00:37:23 +01:00
J3fftw1
c2230f1763 fixes dupe with geominer 2019-12-02 23:14:22 +01:00
poma123
1ddd46768e Changed android getter & updated javadocs 2019-12-02 16:21:55 +01:00
J3fftw1
5e52a5d3ab actually fixes it now 
removed if (list.size() % 2 != 0) list.add(null);
 2019-12-02 15:58:33 +01:00
poma123
426dd64a2b Added android getter and some javadocs 2019-12-02 15:15:48 +01:00
TheBusyBiscuit
8183a1a5af Fixes #1269 2019-12-01 20:55:46 +01:00
TheBusyBiscuit
958a3c0429 Fixed IllegalArgumentException for second-page credits 2019-12-01 19:22:23 +01:00
TheBusyBiscuit
2c64adc536 [CI skip] Minor UI change 2019-12-01 19:18:02 +01:00
TheBusyBiscuit
4ffc2888fd Fixed credits now showing everyone 2019-12-01 19:16:27 +01:00
TheBusyBiscuit
78df2e3ea5 Added Electric Press 2019-12-01 19:08:32 +01:00
TheBusyBiscuit
15d1d708f6 Fixed guide showing incomplete recipes for some machines 2019-12-01 18:59:14 +01:00
TheBusyBiscuit
20cdda2845 Fixed multi tools again 2019-12-01 18:42:33 +01:00
TheBusyBiscuit
3a608cfe4f Fixed multi tools 2019-12-01 18:39:37 +01:00
TheBusyBiscuit
accb018b22 Reduced a bit more technical debt 2019-12-01 18:37:43 +01:00
TheBusyBiscuit
b4faad9a72 Reduced technical debt on MultiTools 2019-12-01 18:35:15 +01:00
TheBusyBiscuit
b5cc48fd9b Changed Grappling Hook Recipe 2019-12-01 18:24:52 +01:00
TheBusyBiscuit
135fe34221
Merge pull request #1275 from J3fftw1/fix/fix-guide-issue-reeee 
Fixes #1272 & #1273
 2019-12-01 16:58:02 +01:00
TheBusyBiscuit
51b347afe8 Changed a few category icons 2019-12-01 16:54:59 +01:00
TheBusyBiscuit
552c907f21 Fixed some christmas items 2019-12-01 16:54:50 +01:00
J3fftw1
90bcc2196c Fixes #1272 & #1273 2019-12-01 16:28:57 +01:00
TheBusyBiscuit
dbab114d8f Possibly fixes #1266 2019-11-30 01:00:24 +01:00
TheBusyBiscuit
ae74412fac Enhanced randomizer algorithm for Gold Pans 2019-11-30 00:58:35 +01:00
TheBusyBiscuit
41327d637c Added new API class 2019-11-30 00:44:44 +01:00
TheBusyBiscuit
d5482f5496 [CI skip] Some additional API work 2019-11-28 20:23:39 +01:00
TheBusyBiscuit
6312d6c431
Merge pull request #1270 from pentabulge/master 
Updated recipes for Automated Panning Machine
 2019-11-28 19:36:53 +01:00
TheBusyBiscuit
3a809ad5ab
Merge pull request #1268 from SoSeDiK/researches 
Changed loading order
 2019-11-28 19:36:38 +01:00
TheBusyBiscuit
015159dfe8 Fixes #1264 2019-11-28 19:35:28 +01:00
TheBusyBiscuit
95e5da325b Restructured a bit of the API (for future versions) 2019-11-28 19:34:43 +01:00
penta
ebe9375a80
Added Iron Nuggets & Soul Sand drops to recipes 2019-11-28 17:34:12 +01:00
poma123
19b604f1de Added javadocs to #getBlock 2019-11-27 17:39:08 +01:00
poma123
88f5d412e5 Event calling added into "movedig" 2019-11-27 17:35:58 +01:00
SoSeDiK
b39a08d557
Changed loading order 
Fixes researching not being enabled by default when starting the server for the first time
 2019-11-27 18:29:45 +02:00
SoSeDiK
f63c290041
Minor changes to formatting 
- Fixed color
- Removed empty lines
- Changed formatting according to the other pages in the guide
 2019-11-27 18:23:11 +02:00
poma123
b069f9c354 Added AndroidMineEvent 2019-11-26 22:46:00 +01:00
J3fftw1
eea32be7dd removed empty lines 2019-11-26 19:30:52 +01:00
J3fftw1
23202d1cd6 few more fixes 2019-11-26 19:29:13 +01:00
J3fftw1
80094b4f1b
Merge branch 'master' into qol/sf-version 2019-11-26 19:26:44 +01:00
J3fftw1
334a1058b4 merged latest master 2019-11-26 19:16:39 +01:00
J3fftw1
b220f3a39e added cscorelib version to the guide 2019-11-26 19:00:35 +01:00
TheBusyBiscuit
61a58d87dd Added Iron Nuggets to Gold Pan drops 2019-11-26 00:48:47 +01:00
TheBusyBiscuit
c9bd5840e0 Added Nether Gold Pan 2019-11-26 00:39:54 +01:00
TheBusyBiscuit
85227f0814
Merge pull request #1258 from NiekWilting/fix-titles 
Fixed the getTitle method.
 2019-11-24 14:28:10 +01:00
Niek Wilting
1f9cbc0b13 Fixed the getTitle method. 2019-11-24 14:11:34 +01:00
TheBusyBiscuit
0a44fa5671 Revamped Guide Settings Menu 2019-11-24 13:23:16 +01:00
TheBusyBiscuit
7ad4d92a14 [CI skip] Added Slimefun Guide and Recipe Types to custom item model 
service
 2019-11-22 14:57:04 +01:00
TheBusyBiscuit
8a605404c1 Added "Flint to Cobblestone" Recipe to the Compressor 2019-11-21 20:36:50 +01:00
TheBusyBiscuit
28ed785cf7
Merge pull request #1247 from J3fftw1/research/jerk 
added jerkys to research
 2019-11-17 21:31:44 +01:00
J3fftw1
1ac713cb58
Update ResearchSetup.java 2019-11-17 21:31:10 +01:00
TheBusyBiscuit
b1950447d6
Added more wiki pages to the guide 2019-11-17 21:30:39 +01:00
J3fftw1
f33218c10e
Update ResearchSetup.java 2019-11-17 21:29:59 +01:00
J3fftw1
8cb7108c27 reeeeeeeee sowwe 2019-11-17 18:49:06 +01:00
J3fftw1
a6129e65e9 fixed the tabs and changed jerky to jerky's 
crossing fingers for correct use of '
 2019-11-17 18:45:50 +01:00
J3fftw1
4b044cba16 fixed suggested changes 2019-11-17 18:26:54 +01:00
J3fftw1
152dcac0c7 fixed the changes SoSeDiK suggested/requested 2019-11-17 11:19:37 +01:00
J3fftw1
29543f4a2a changes 2019-11-16 23:48:30 +01:00
Daniel Walsh
1569f7e05e
Fix #1229 2019-11-16 22:06:26 +00:00
J3fftw1
4a83ecca07 added jerkys to research 2019-11-16 20:08:46 +01:00
TheBusyBiscuit
0a08690ae9
Merge pull request #1244 from poma123/patch-1 
AutoDisenchantEvent
 2019-11-16 17:47:32 +01:00
Poma123
87caf6ee45
Update AutoDisenchantEvent.java 2019-11-16 17:03:56 +01:00
Poma123
da0fe57ab7
Update AutoDisenchantEvent.java 2019-11-16 16:58:27 +01:00
Poma123
918d9c3506
Update AutoDisenchanter.java 2019-11-16 16:36:45 +01:00
Poma123
212b7cffd3
Update AutoDisenchantEvent.java 2019-11-16 16:35:22 +01:00
Poma123
72a7f4598f
Update and rename DisenchanterEvent.java to AutoDisenchantEvent.java 2019-11-16 16:34:14 +01:00
Poma123
201159f3bf
Update AutoDisenchanter.java 2019-11-16 16:29:59 +01:00
Poma123
537fc57f48
Update AutoDisenchanter.java 2019-11-16 16:27:15 +01:00
Poma123
d18adecb9a
Update DisenchanterEvent.java 2019-11-16 16:26:28 +01:00
Poma123
fa57e61447
Update AutoDisenchanter.java 2019-11-16 15:50:52 +01:00
Poma123
6f3bf2db13
Update DisenchanterEvent.java 2019-11-16 15:49:06 +01:00
Poma123
c6428c0e4b
Update AutoDisenchanter.java 2019-11-16 14:09:09 +01:00
Poma123
f0c0919bce
Add DisenchanterEvent 2019-11-16 14:08:38 +01:00
TheBusyBiscuit
fcf9b547c1
Merge pull request #1230 from SoSeDiK/transmitters 
Transmitters
 2019-11-16 14:08:22 +01:00
TheBusyBiscuit
09ab124e36 Added Output Chest support to the Table Saw 2019-11-10 20:18:06 +01:00
SoSeDiK
78c81bafdb
Merge branch 'master' into transmitters 2019-11-10 21:04:50 +02:00
TheBusyBiscuit
7890edd295 Added Output Chest Support to the Automated Panning Machine 2019-11-10 19:44:53 +01:00
TheBusyBiscuit
a10fe1e514 Fixed custom model data 2019-11-10 18:54:53 +01:00
TheBusyBiscuit
40616ee47e
Merge pull request #1239 from TheBusyBiscuit/custom-textures 
Added support for custom item models
 2019-11-10 18:52:36 +01:00
TheBusyBiscuit
97d8ce1546 Moved CoreProtect integration to CS-CoreLib2 2019-11-10 18:52:18 +01:00
TheBusyBiscuit
3e30ce8d14 Reduced technical debt 2019-11-10 18:43:37 +01:00
TheBusyBiscuit
2459469c9d Added support for custom item models 2019-11-10 17:46:18 +01:00
TheBusyBiscuit
2c7e155aa1 Added different kinds of Jerky to the Auto-Drier 2019-11-10 13:51:56 +01:00
TheBusyBiscuit
25f8566196
Merge pull request #1222 from AlexLander123/fixes 
Changed method of accessing reactor from access port
 2019-11-10 13:01:19 +01:00
TheBusyBiscuit
fc67fac34c [CI skip] Changed default version string 2019-11-10 13:01:07 +01:00
AlexLander123
c13ec9903c Ancient altar no longer able to craft items that are not unlocked 2019-11-06 02:17:52 +08:00
AlexLander123
9442fa65ca Fixed ancient alter logic 2019-11-06 00:56:03 +08:00
AlexLander123
e4efed0640 Made requested changes 
- Added null check
- Changed "a access port" to "the access port"
- Removed extra menu.open(p)
 2019-11-06 00:08:25 +08:00
SoSeDiK
2fb92c5083 Update GPSNetwork.java 2019-11-04 16:36:10 +02:00
SoSeDiK
0302810c9c Replaced double with int 2019-11-04 16:33:40 +02:00
SoSeDiK
09c02b7848 Fixed transmitter locations 2019-11-04 16:28:12 +02:00
TheBusyBiscuit
8895beb83a [CI skip] Minor refactoring 2019-11-03 23:43:11 +01:00
TheBusyBiscuit
57da6db9be Reduced technical debt and improved talisman performance 2019-11-03 21:32:44 +01:00
TheBusyBiscuit
a1e47d5ce0 Many bug fixes, many guide improvements 2019-11-03 20:36:46 +01:00
TheBusyBiscuit
27019c9ceb Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 20:28:35 +01:00
TheBusyBiscuit
6a1b6ffd92 Added support for ALL Vanilla Recipes (+ Faster Guide Responses) 2019-11-03 20:28:25 +01:00
Daniel Walsh
2febbe4d1c order 2019-11-03 19:05:32 +00:00
Daniel Walsh
d88291e215 Bring across repair cost in the disenchanter 2019-11-03 19:03:55 +00:00
TheBusyBiscuit
d86cb5e5b6 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-11-03 19:23:39 +01:00
TheBusyBiscuit
fc6bd05b4f
[CI skip] Merge pull request #1223 from J3fftw1/good/fix/yes/yes 
Fixes
 2019-11-03 19:23:19 +01:00
TheBusyBiscuit
beebbda2dd Fixes #1224 2019-11-03 19:20:22 +01:00
TheBusyBiscuit
5c860cbfa4 Fixes #1226 2019-11-03 19:20:12 +01:00
J3fftw1
cade8df053 Fixes #1219 2019-10-31 16:24:27 +01:00
AlexLander123
6dd56e23f2 Changed method of accessing reactor from access port 
The change is made to stop inventory.no-access message when opening access port due to canOpen(Block, Player) returning false
 2019-10-31 22:01:53 +08:00
TheBusyBiscuit
05858309c5 [CI skip] Reduced technical debt 2019-10-29 09:13:32 +01:00
TheBusyBiscuit
7ba0eba4e9 Fixes #1211 2019-10-28 14:53:54 +01:00
AlexLander123
8601986c09 Allow reactors to take in fuel from access port 
- Also allow reactors to take in fuel in bulk
 2019-10-28 04:02:06 +08:00
TheBusyBiscuit
9f3c3a413b Some optimizations, also changed /sf timings to use floating point times 2019-10-27 20:07:12 +01:00
TheBusyBiscuit
e036e0f756 Fixes #1206 2019-10-27 14:18:31 +01:00
TheBusyBiscuit
bf4991264b Migrated more Items to the new System (+ Added auto-migration) 2019-10-27 14:38:39 +01:00
TheBusyBiscuit
57e1126553 Optimized and cleaned up guide 2019-10-20 16:41:28 +02:00
TheBusyBiscuit
1c12b892fe
Merge pull request #1203 from J3fftw1/veinminerfix 
fixes #1202
 2019-10-20 14:25:25 +02:00
J3fftw1
852b4bfc2a fixes #1202 2019-10-20 14:19:27 +02:00
TheBusyBiscuit
ad3ca513ad Fixed Multi Tools 2019-10-19 19:06:38 +02:00
TheBusyBiscuit
783a66d2da Fixed Food 2019-10-19 18:20:08 +02:00
TheBusyBiscuit
bb2d9d851f Fixes #1153 2019-10-19 18:18:17 +02:00
TheBusyBiscuit
41811b90f1 [CI skip] Added some documentation to the code 2019-10-19 16:48:22 +02:00
TheBusyBiscuit
a3bf63a023 More optimizations (+ Added more Jerky Meat) 2019-10-19 16:16:40 +02:00
TheBusyBiscuit
3eed8cebc6 Another fix 2019-10-19 15:15:11 +02:00
TheBusyBiscuit
70cc1d04f4 Fixes #1196 2019-10-19 15:14:05 +02:00
TheBusyBiscuit
c5341a6b02 Fixes #1196 2019-10-19 15:04:45 +02:00
TheBusyBiscuit
fc7c4e4d81 Fixed #1200 2019-10-19 12:53:13 +02:00
TheBusyBiscuit
260c3a51dd More code cleanup (+ Added Sweet Berries Organic Food/Fertilizer) 2019-10-19 10:30:15 +02:00
AlexLander123
1dc669740c Allow /sf cheat to have all categories unlocked 
- If the player who who is using /sf cheat have not unlocked the category, they will still have access to it
- Removed empty code
 2019-10-18 21:27:28 +08:00
J3fftw1
576b297b50 Fixed ExplosivePickaxe 2019-10-18 00:15:48 +02:00
J3fftw1
470f5f1afe fixed requested changes 2019-10-17 23:23:25 +02:00
J3fftw1
10fe7238ad fixed broken items 2019-10-17 23:14:43 +02:00
TheBusyBiscuit
06e3125a6d Repositioned back button for guide search 2019-10-17 01:33:49 +02:00
TheBusyBiscuit
f71b925a41 Improved Guide Search 2019-10-17 01:27:00 +02:00
TheBusyBiscuit
ee6dfae045 Fixed Guide Search's back button 2019-10-17 01:21:04 +02:00
TheBusyBiscuit
5fa021469f Added a logging message 2019-10-17 01:12:47 +02:00
TheBusyBiscuit
07827ecc53 Moved Guide History to Player Profiles 2019-10-17 01:08:14 +02:00
TheBusyBiscuit
45a688e148 Added wiki pages to the guide 2019-10-17 00:49:55 +02:00
TheBusyBiscuit
18b5bda4a8 [CI skip] Introduced proper Maven structure 2019-10-17 00:37:46 +02:00