1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

2745 Commits

Author SHA1 Message Date
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