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

2812 Commits

Author SHA1 Message Date
LinoxGH
841b2003bb Added 1.13 compability for auto drier. 2020-06-24 21:33:22 +03:00
LinoxGH
daadabd535 Fixed an import dis-organisation. 2020-06-24 21:25:42 +03:00
LinoxGH
4f6bbafdfc Added Auto Brewer.
A new medium machine that can create potions automatically.
2020-06-24 21:24:16 +03:00
TheBusyBiscuit
58ccc4b87a Added Tagalog 2020-06-24 20:18:55 +02:00
TheBusyBiscuit
db3bb29777
[CI skip] Merge pull request #2019 from Neon72/patch-1
Fortune cookies
2020-06-24 20:18:18 +02:00
Neon72
cc8564a1f1
Fortune Cookies #2
You meant like this Cookie? (I realised 5 seconds after I posted the comment what you meant)
2020-06-24 20:15:07 +02:00
TheBusyBiscuit
750307d487
[CI skip] Merge pull request #2018 from TheBusyBiscuit/gitlocalize-12195
Added Tagalog
2020-06-24 20:11:50 +02:00
TheBusyBiscuit
0578c1349e
[CI skip] Merge pull request #2017 from TheBusyBiscuit/gitlocalize-12188
Added tagalog translations for researches
2020-06-24 20:11:34 +02:00
TheBusyBiscuit
8550092b26
[CI skip] Merge pull request #2011 from TheBusyBiscuit/gitlocalize-12174
Added some translations for Tagalog
2020-06-24 20:11:08 +02:00
TheBusyBiscuit
e26dd09664
[CI skip] Merge pull request #2016 from TheBusyBiscuit/gitlocalize-12187
Updated korean translations
2020-06-24 20:10:55 +02:00
Neon72
8b87fe8b06
Fortune Cookies Fix #1
I have "escaped" the single quote issue
2020-06-24 19:42:55 +02:00
TheBusyBiscuit
6840a1e957 Updated assets 2020-06-24 18:57:12 +02:00
Scott Gomez Andoy
6f5adfd31a Translate messages_tl.yml via GitLocalize 2020-06-24 16:55:51 +00:00
TheBusyBiscuit
d3f1dc6fb3 Fixes #1855 plus a few optimizations 2020-06-24 18:50:39 +02:00
TheBusyBiscuit
8d373a3812 Minor changes 2020-06-24 14:54:43 +02:00
Scott Gomez Andoy
258467ef3a Translate researches_tl.yml via GitLocalize 2020-06-24 08:12:52 +00:00
AOJUCBJD
9019f268af Translate categories_ko.yml via GitLocalize 2020-06-24 08:07:47 +00:00
LinoxGH
573068283a Added the support for 1.13 2020-06-24 01:17:14 +03:00
LinoxGH
3278457441 Did the requested changes. 2020-06-24 01:06:48 +03:00
LinoxGH
9205b143ed Added Magic Pills.
Added Magic Pills which are used to cure zombie villagers.
Approved suggestion #178
2020-06-23 21:11:08 +03:00
MintFighter
47c53a0e36
Fortune cookies
a few more quotes for fortune cookies
2020-06-23 00:37:20 +02:00
TheBusyBiscuit
4504259546 Fixed a Unit test 2020-06-22 23:02:21 +02:00
TheBusyBiscuit
1c50d29fa8 Added Nether Quartz Ore Crusher Recipe 2020-06-22 22:49:07 +02:00
TheBusyBiscuit
bab94652bc Duplication glitch fix and performance improvements for Rainbow blocks 2020-06-22 22:45:14 +02:00
TheBusyBiscuit
bdb25b74ec Changed the texture of the Nether Star Reactor 2020-06-22 14:22:41 +02:00
TheBusyBiscuit
7d8ef33d78 Changed the texture for the Nuclear Reactor 2020-06-22 12:07:56 +02:00
Scott Gomez Andoy
c2a850b732 Translate resources_tl.yml via GitLocalize 2020-06-22 10:00:53 +00:00
Scott Gomez Andoy
2c1e1cacad Translate recipes_tl.yml via GitLocalize 2020-06-22 10:00:50 +00:00
Scott Gomez Andoy
8d6640693f Translate categories_tl.yml via GitLocalize 2020-06-22 10:00:48 +00:00
TheBusyBiscuit
a06e49cf13 Improvements to error logging in world loading 2020-06-22 01:55:11 +02:00
TheBusyBiscuit
f8182e4e3b Fixed Infused Magnet working even if you haven't researched it 2020-06-21 19:51:34 +02:00
TheBusyBiscuit
8e07ada321 Reduced technical debt / Refactoring 2020-06-21 10:26:54 +02:00
TheBusyBiscuit
d18cb3a898 Adjusted Unit Tests to new behaviour 2020-06-20 21:45:24 +02:00
TheBusyBiscuit
68532ea38f Small improvement 2020-06-20 21:41:19 +02:00
TheBusyBiscuit
24cea8dade Further Improvements on the backwards-compatibility toggle 2020-06-20 21:39:41 +02:00
TheBusyBiscuit
c98aca37f1 Massive Performance improvements to GEO-Miner and Oil Pump 2020-06-20 19:33:37 +02:00
TheBusyBiscuit
4b38dd655d Added ReactorExplodeEvent to the API 2020-06-20 19:21:44 +02:00
TheBusyBiscuit
907fb1566a Fixes #2009 2020-06-20 18:52:30 +02:00
TheBusyBiscuit
1456245ee0 Added a toggle for backwards compatibility 2020-06-20 11:56:29 +02:00
TheBusyBiscuit
7059ad216c Refactoring and general improvements 2020-06-19 13:22:52 +02:00
Nameless
7eefde0982 Translate categories_zh-CN.yml via GitLocalize 2020-06-19 05:36:34 +00:00
TheBusyBiscuit
3c3dd48e9b Fixes #2005 2020-06-18 21:15:47 +02:00
TheBusyBiscuit
33db9151d6 Lots of refactoring and clean up 2020-06-17 14:56:48 +02:00
TheBusyBiscuit
5c14bc5cbe Refactoring 2020-06-17 01:24:47 +02:00
TheBusyBiscuit
f0b5d55c48 Reduced technical debt 2020-06-16 15:40:05 +02:00
TheBusyBiscuit
e82acc0b3c Refactoring 2020-06-16 15:36:44 +02:00
TheBusyBiscuit
0fd631813b [CI skip] Removed some deprecated stuff 2020-06-16 14:50:03 +02:00
TheBusyBiscuit
314907eb82 A ton of refactoring 2020-06-16 14:16:21 +02:00
TheBusyBiscuit
c77a2c2997 Did some long overdue refactoring 2020-06-16 01:54:18 +02:00
TheBusyBiscuit
d628f8586f Really really big refactoring and deprecation 2020-06-16 01:16:14 +02:00
TheBusyBiscuit
ffa3ea1c1b Further improvements to Unit Tests 2020-06-15 15:01:33 +02:00
TheBusyBiscuit
944c009afb [CI skip] Added Unit Tests for GEO Resources 2020-06-15 13:29:15 +02:00
TheBusyBiscuit
913ce0777b Added wiki.json Unit Test 2020-06-15 13:29:02 +02:00
TheBusyBiscuit
4efc10db15 Fixes #1907 2020-06-15 11:53:38 +02:00
TheBusyBiscuit
11a0d24fd1
[CI skip] Merge pull request #1983 from TheBusyBiscuit/gitlocalize-12080
Optimize some text and update to latest
2020-06-15 10:58:16 +02:00
TheBusyBiscuit
a298bea770
[CI skip] Merge pull request #2004 from TheBusyBiscuit/gitlocalize-12117
added translation
2020-06-15 10:54:51 +02:00
TheBusyBiscuit
cd8e22f1fc
[CI skip] Merge pull request #2002 from TheBusyBiscuit/gitlocalize-12115
refactor translations
2020-06-15 10:53:29 +02:00
Dams_
3cb48b36a6 Translate categories_fr.yml via GitLocalize 2020-06-15 08:37:09 +00:00
Pierre
c62756c482 Translate recipes_fr.yml via GitLocalize 2020-06-15 08:32:37 +00:00
Dams_
1c252e969f Translate recipes_fr.yml via GitLocalize 2020-06-15 08:32:36 +00:00
Edwin Kerforne
fd7b86d5be Translate recipes_fr.yml via GitLocalize 2020-06-15 08:32:35 +00:00
Dams_
50ed229443 Translate researches_fr.yml via GitLocalize 2020-06-15 08:30:57 +00:00
Muhammad Kamal Fergany
794012de16 Translate categories_ar.yml via GitLocalize 2020-06-14 23:54:43 +00:00
Luu7
6b8a0f3727 Translate categories_es.yml via GitLocalize 2020-06-14 20:40:49 +00:00
TheBusyBiscuit
44813c0c35
[CI skip] Merge pull request #1996 from TheBusyBiscuit/gitlocalize-12111
Updated Ukrainian categories
2020-06-14 20:17:30 +02:00
SoSeDiK
d2b692df84 Translate categories_uk.yml via GitLocalize 2020-06-14 18:01:56 +00:00
SoSeDiK
172687efb5 Translate categories_ru.yml via GitLocalize 2020-06-14 18:01:51 +00:00
TheBusyBiscuit
c640b16ce4 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-14 19:29:02 +02:00
TheBusyBiscuit
c84dd02b39 Fixes #1993 2020-06-14 19:28:51 +02:00
TheBusyBiscuit
98b0834daa Translate categories_de.yml via GitLocalize 2020-06-14 17:24:48 +00:00
TheBusyBiscuit
4855f0da86 Androids now have a seperate category 2020-06-14 18:58:38 +02:00
TheBusyBiscuit
2bead0cd3d Maybe fixes #1951 2020-06-14 13:34:31 +02:00
TheBusyBiscuit
2733b8a17b Fixes #1992 and changes to the fishing loot for androids 2020-06-14 13:01:38 +02:00
TheBusyBiscuit
81f7eefe23
[CI skip] Merge pull request #1990 from TheBusyBiscuit/gitlocalize-12101
Turkish Translation Update Pt.3
2020-06-14 10:47:10 +02:00
LinoxGH
8176cd4576 Translate researches_tr.yml via GitLocalize 2020-06-14 05:15:46 +00:00
LinoxGH
d544dddee7 Translate recipes_tr.yml via GitLocalize 2020-06-14 05:15:08 +00:00
Nameless
b5a899e4ae Translate messages_zh-CN.yml via GitLocalize 2020-06-14 03:18:17 +00:00
TheBusyBiscuit
cf24923e9c Fixes #1985 2020-06-14 02:39:01 +02:00
TheBusyBiscuit
85af23c17c Fixes #1988 2020-06-14 02:36:32 +02:00
TheBusyBiscuit
0a6e00fae5 Deleted a faulty Unit Test 2020-06-13 22:16:06 +02:00
TheBusyBiscuit
39035daea7
Merge pull request #1984 from TheBusyBiscuit/gitlocalize-12085
Updated czech translations
2020-06-13 21:28:57 +02:00
TheBusyBiscuit
c1ae5730cb
[CI skip] Merge pull request #1986 from TheBusyBiscuit/gitlocalize-12095
Turkish Translation Update Pt.1
2020-06-13 21:28:41 +02:00
TheBusyBiscuit
debc925bd0 Fixes #1976 2020-06-13 21:24:28 +02:00
TheBusyBiscuit
c915b3375b [Ci skip] Updated MockBukkit 2020-06-13 21:05:55 +02:00
LinoxGH
75afba8c99 Translate messages_tr.yml via GitLocalize 2020-06-13 15:25:13 +00:00
TheBusyBiscuit
e3dc17a9df [CI skip] Reduced technical debt 2020-06-13 13:52:53 +02:00
TheBusyBiscuit
4dbc66fc4e [CI skip] More refactoring 2020-06-13 13:05:22 +02:00
TheBusyBiscuit
872c83f1a6 [CI skip] Updated translators 2020-06-13 10:21:15 +02:00
mt-gitlocalize
89f9f82576 Translate messages_cs.yml via GitLocalize 2020-06-13 08:18:43 +00:00
frfole
f4329d021d Translate messages_cs.yml via GitLocalize 2020-06-13 08:18:42 +00:00
100petr
f04e0b58b8 Translate messages_cs.yml via GitLocalize 2020-06-13 08:18:41 +00:00
100petr
2622ce303d Translate categories_cs.yml via GitLocalize 2020-06-13 08:18:39 +00:00
TheBusyBiscuit
7baa3cb81b [CI skip] Reduced technical debt 2020-06-13 10:15:18 +02:00
Akira Yamazaki
10c10d5f55 Translate categories_zh-CN.yml via GitLocalize 2020-06-13 02:33:25 +00:00
Rothes
f8c81623d4 Translate messages_zh-CN.yml via GitLocalize 2020-06-13 02:33:24 +00:00
Nameless
b424440190 Translate messages_zh-CN.yml via GitLocalize 2020-06-13 02:33:23 +00:00
Nameless
640c8e8f01 Translate researches_zh-CN.yml via GitLocalize 2020-06-13 02:33:22 +00:00
TheBusyBiscuit
e45764ade1 Refactored a bunch of android-related things 2020-06-13 01:50:48 +02:00
TheBusyBiscuit
e7b7061b56 Added further documentation 2020-06-13 01:08:42 +02:00
TheBusyBiscuit
62ffb59ba2 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-06-13 01:02:39 +02:00