mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Code Releases Activity
3,579 Commits 1 Branch 0 Tags 64 MiB
0578c1349e
Commit Graph

1536 Commits

Author SHA1 Message Date
SoSeDiK
172687efb5 Translate categories_ru.yml via GitLocalize 2020-06-14 18:01:51 +00:00
TheBusyBiscuit
c640b16ce4 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-14 19:29:02 +02:00
TheBusyBiscuit
c84dd02b39 Fixes #1993 2020-06-14 19:28:51 +02:00
TheBusyBiscuit
98b0834daa Translate categories_de.yml via GitLocalize 2020-06-14 17:24:48 +00:00
TheBusyBiscuit
4855f0da86 Androids now have a seperate category 2020-06-14 18:58:38 +02:00
TheBusyBiscuit
2bead0cd3d Maybe fixes #1951 2020-06-14 13:34:31 +02:00
TheBusyBiscuit
2733b8a17b Fixes #1992 and changes to the fishing loot for androids 2020-06-14 13:01:38 +02:00
TheBusyBiscuit
81f7eefe23
[CI skip] Merge pull request #1990 from TheBusyBiscuit/gitlocalize-12101 
Turkish Translation Update Pt.3
 2020-06-14 10:47:10 +02:00
LinoxGH
8176cd4576 Translate researches_tr.yml via GitLocalize 2020-06-14 05:15:46 +00:00
LinoxGH
d544dddee7 Translate recipes_tr.yml via GitLocalize 2020-06-14 05:15:08 +00:00
Nameless
b5a899e4ae Translate messages_zh-CN.yml via GitLocalize 2020-06-14 03:18:17 +00:00
TheBusyBiscuit
cf24923e9c Fixes #1985 2020-06-14 02:39:01 +02:00
TheBusyBiscuit
85af23c17c Fixes #1988 2020-06-14 02:36:32 +02:00
TheBusyBiscuit
39035daea7
Merge pull request #1984 from TheBusyBiscuit/gitlocalize-12085 
Updated czech translations
 2020-06-13 21:28:57 +02:00
TheBusyBiscuit
c1ae5730cb
[CI skip] Merge pull request #1986 from TheBusyBiscuit/gitlocalize-12095 
Turkish Translation Update Pt.1
 2020-06-13 21:28:41 +02:00
TheBusyBiscuit
debc925bd0 Fixes #1976 2020-06-13 21:24:28 +02:00
LinoxGH
75afba8c99 Translate messages_tr.yml via GitLocalize 2020-06-13 15:25:13 +00:00
TheBusyBiscuit
e3dc17a9df [CI skip] Reduced technical debt 2020-06-13 13:52:53 +02:00
TheBusyBiscuit
4dbc66fc4e [CI skip] More refactoring 2020-06-13 13:05:22 +02:00
TheBusyBiscuit
872c83f1a6 [CI skip] Updated translators 2020-06-13 10:21:15 +02:00
mt-gitlocalize
89f9f82576 Translate messages_cs.yml via GitLocalize 2020-06-13 08:18:43 +00:00
frfole
f4329d021d Translate messages_cs.yml via GitLocalize 2020-06-13 08:18:42 +00:00
100petr
f04e0b58b8 Translate messages_cs.yml via GitLocalize 2020-06-13 08:18:41 +00:00
100petr
2622ce303d Translate categories_cs.yml via GitLocalize 2020-06-13 08:18:39 +00:00
TheBusyBiscuit
7baa3cb81b [CI skip] Reduced technical debt 2020-06-13 10:15:18 +02:00
Akira Yamazaki
10c10d5f55 Translate categories_zh-CN.yml via GitLocalize 2020-06-13 02:33:25 +00:00
Rothes
f8c81623d4 Translate messages_zh-CN.yml via GitLocalize 2020-06-13 02:33:24 +00:00
Nameless
b424440190 Translate messages_zh-CN.yml via GitLocalize 2020-06-13 02:33:23 +00:00
Nameless
640c8e8f01 Translate researches_zh-CN.yml via GitLocalize 2020-06-13 02:33:22 +00:00
TheBusyBiscuit
e45764ade1 Refactored a bunch of android-related things 2020-06-13 01:50:48 +02:00
TheBusyBiscuit
e7b7061b56 Added further documentation 2020-06-13 01:08:42 +02:00
TheBusyBiscuit
62ffb59ba2 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-13 01:02:39 +02:00
TheBusyBiscuit
bc274372ce
Merge pull request #1981 from PhanaticD/patch-2 2020-06-13 00:57:52 +02:00
Josh
0b4904831b
update 2020-06-12 18:52:54 -04:00
Josh
a232d82851
add check 2020-06-12 18:10:06 -04:00
Josh
5f8ae4b182
don't get it twice 2020-06-12 18:04:55 -04:00
Josh
e989969713
safety check in CustomItemDataService 2020-06-12 18:01:19 -04:00
Josh
56bd432719
check if null in getItemMeta 2020-06-12 17:29:04 -04:00
TheBusyBiscuit
5795ccfaba Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-12 23:24:55 +02:00
TheBusyBiscuit
1fc77c2ee2
[CI skip] Merge pull request #1978 from TheBusyBiscuit/gitlocalize-12075 
Updated Russian messages
 2020-06-12 23:18:43 +02:00
TheBusyBiscuit
63abe6f292
[CI skip] Merge pull request #1979 from TheBusyBiscuit/gitlocalize-12076 
Updated Ukrainian messages
 2020-06-12 23:17:53 +02:00
TheBusyBiscuit
0f98670616
[CI skip] Merge pull request #1980 from TheBusyBiscuit/gitlocalize-12077 
Updated Ukrainian researches
 2020-06-12 23:15:45 +02:00
Josh
6bc28d6b69
allow null meta 2020-06-12 17:09:57 -04:00
SoSeDiK
1a2fd0b078 Translate researches_uk.yml via GitLocalize 2020-06-12 19:52:23 +00:00
SoSeDiK
54c421c317 Translate messages_uk.yml via GitLocalize 2020-06-12 19:52:16 +00:00
SoSeDiK
fdf630aec4 Translate messages_ru.yml via GitLocalize 2020-06-12 19:52:11 +00:00
TheBusyBiscuit
fec7b163de Translate messages_ru.yml via GitLocalize 2020-06-12 19:52:10 +00:00
SoSeDiK
da6be4b00f Translate researches_ru.yml via GitLocalize 2020-06-12 19:52:04 +00:00
TheBusyBiscuit
b304ce14e1 [CI skip] Added lots more unit tests, some will be skipped 2020-06-12 19:18:29 +02:00
TheBusyBiscuit
9b2c378c3a [CI skip] Refactored unit tests 2020-06-12 18:55:09 +02:00
TheBusyBiscuit
7249a92bad
Merge pull request #1975 from TheBusyBiscuit/gitlocalize-12057 
Add untranslated messages for messages_vi.yml
 2020-06-11 13:52:00 +02:00
TheBusyBiscuit
c5cc2a86ff [CI skip] Refactoring and optimizations 2020-06-11 13:50:22 +02:00
nahkd123
8b648d428d Translate messages_vi.yml via GitLocalize 2020-06-11 11:32:51 +00:00
nahkd123
fda98cb9c6 Translate messages_vi.yml via GitLocalize 2020-06-11 11:21:22 +00:00
nahkd123
2d85d209ca Translate messages_vi.yml via GitLocalize 2020-06-11 11:15:33 +00:00
TheBusyBiscuit
79e8ca46ff Another small optimization 2020-06-11 11:42:24 +02:00
TheBusyBiscuit
aeab6df103 Small performance improvements for cargo networks 2020-06-11 10:08:08 +02:00
TheBusyBiscuit
25d970ea94 Fixes #1971 2020-06-11 09:34:29 +02:00
TheBusyBiscuit
5c20d3b470
Merge pull request #1963 from siaynoq/gold-ingot-pulverize 
Adding recipe for vanilla Gold Ingot -> Gold Dust conversion
 2020-06-11 00:43:49 +02:00
TheBusyBiscuit
f58d6aeff4 Small performance improvement 2020-06-11 00:43:17 +02:00
Siaynoq
1156cb33c0 Removed unneeded construction of GOLD_DUST 2020-06-11 08:33:37 +10:00
Siaynoq
5bf4604026 Removed unneeded array objects 2020-06-11 08:05:50 +10:00
TheBusyBiscuit
7acee959ce Lots of refactoring 2020-06-10 23:33:51 +02:00
TheBusyBiscuit
22650f53dd [Ci skip] Refactoring 2020-06-10 21:26:28 +02:00
TheBusyBiscuit
91f934b755
Merge pull request #1970 from TheBusyBiscuit/gitlocalize-12052 
messages_es
 2020-06-10 20:43:24 +02:00
Vravinite
837e8437c8 Translate messages_es.yml via GitLocalize 2020-06-10 16:48:39 +00:00
Luu7
46daf1f66b Translate messages_es.yml via GitLocalize 2020-06-10 16:48:37 +00:00
Vravinite
96fe2b7f02 Translate researches_es.yml via GitLocalize 2020-06-10 16:47:41 +00:00
TheBusyBiscuit
dc592605d6 [Ci skip] Fixed javadoc warning 2020-06-10 17:51:02 +02:00
TheBusyBiscuit
316d70ecc6 [CI skip] Added Unit Tests for /sf backpack 2020-06-10 17:48:00 +02:00
TheBusyBiscuit
9eb22db6de [CI skip] Added more Unit Tests 2020-06-10 17:33:14 +02:00
TheBusyBiscuit
da7291995b [CI skip] Added some Unit Tests for commands 2020-06-10 17:11:28 +02:00
JulieSigtunas
4f93af1616 Translate recipes_vi.yml via GitLocalize 2020-06-10 13:37:30 +00:00
JustAPieOP
05df407e0e Translate recipes_vi.yml via GitLocalize 2020-06-10 13:37:29 +00:00
justsiro
c74fb6560b Translate recipes_vi.yml via GitLocalize 2020-06-10 13:37:28 +00:00
nahkd123
ae1c0f42e6 Translate recipes_vi.yml via GitLocalize 2020-06-10 13:37:27 +00:00
TheBusyBiscuit
1ec2fd1b74 Translate messages_de.yml via GitLocalize 2020-06-10 12:07:10 +00:00
TheBusyBiscuit
919c86aebe
[CI skip] Merge pull request #1961 from TheBusyBiscuit/gitlocalize-12043 
Translate added section in messags.yml into Japanese.
 2020-06-10 09:59:53 +02:00
TheBusyBiscuit
79198a1f1f
[Ci skip] Merge pull request #1962 from TheBusyBiscuit/gitlocalize-12044 
Translate added section in researches.yml into Japanese.
 2020-06-10 09:57:57 +02:00
TheBusyBiscuit
da8d3de538
[Ci skip] Merge pull request #1965 from TheBusyBiscuit/gitlocalize-12046 
Translation 6
 2020-06-10 09:57:26 +02:00
TheBusyBiscuit
9f3a204313
[CI skip] Merge pull request #1960 from TheBusyBiscuit/gitlocalize-12042 
Updated german research translations
 2020-06-10 09:55:46 +02:00
Turret
9e8d2d6450 Translate researches_sv.yml via GitLocalize 2020-06-10 05:05:07 +00:00
Siaynoq
c44730c589 Adding recipe for vanilla Gold Ingot -> Gold Dust conversion 2020-06-10 14:06:03 +10:00
bito-blosh
d7700f9140 Translate researches_ja.yml via GitLocalize 2020-06-10 03:05:42 +00:00
bito-blosh
13091e2e5d Translate messages_ja.yml via GitLocalize 2020-06-10 03:05:07 +00:00
TheBusyBiscuit
005d2a3c6a Fixed lore 2020-06-09 23:36:01 +02:00
TheBusyBiscuit
ced1580844 Translate researches_de.yml via GitLocalize 2020-06-09 21:26:07 +00:00
TheBusyBiscuit
b659e51008
Merge pull request #1953 from TheBusyBiscuit/feature/miner 
Added Industrial Miner & Removed Digital Miner
 2020-06-09 23:23:56 +02:00
TheBusyBiscuit
504df60a73
Merge pull request #1957 from TheBusyBiscuit/gitlocalize-12028 
Added danish translations for categories
 2020-06-09 23:23:18 +02:00
TheBusyBiscuit
d645fcc75b [CI skip] Updated translators list 2020-06-09 23:23:02 +02:00
TheBusyBiscuit
df947e0967 [CI skip] Refactoring 2020-06-09 23:21:37 +02:00
TheBusyBiscuit
013696a759
Merge branch 'master' into feature/miner 2020-06-09 00:12:33 +02:00
TheBusyBiscuit
4f7b06be4c Changes to organic food/fertilizer 2020-06-09 00:10:32 +02:00
TheBusyBiscuit
abe8afab67 More balancing for Organic Food/Fertilizer 2020-06-08 23:25:45 +02:00
TheBusyBiscuit
bd712472d5 Balancing changes to Organic Food/Fertilizer, added cocoa variant 2020-06-08 23:13:44 +02:00
mt-gitlocalize
cb68c92dc5 Translate categories_da.yml via GitLocalize 2020-06-08 21:00:05 +00:00
Mini-kun
633f84178e Translate categories_da.yml via GitLocalize 2020-06-08 21:00:03 +00:00
TheBusyBiscuit
70738a45ee Refactored recipe service for electric furnaces 2020-06-08 14:20:01 +02:00
TheBusyBiscuit
615e0c07a2 Minor changes 2020-06-07 17:48:10 +02:00
TheBusyBiscuit
586a6970ed
Updated translator list 2020-06-05 18:18:18 +02:00