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

4435 Commits

Author SHA1 Message Date
TheBusyBiscuit
df0ab0e4fe
[CI skip] Merge pull request #2201 from TheBusyBiscuit/gitlocalize-12547
Updated spanish translations
2020-08-06 09:54:21 +02:00
TheBusyBiscuit
3fb6b57c3c
[CI skip] Updated workflow file 2020-08-06 09:52:59 +02:00
TheBusyBiscuit
faad86b750
[CI skip] Updated workflow file 2020-08-06 09:52:31 +02:00
TheBusyBiscuit
5093cac924
[CI skip] Updated workflow file 2020-08-06 09:51:46 +02:00
TheBusyBiscuit
344596b10f
[CI skip] Updated workflow file 2020-08-06 09:51:15 +02:00
TheBusyBiscuit
353aef44a2
[CI skip] Updated workflow file 2020-08-06 09:50:37 +02:00
Vravinite
b0c040ea7a Translate recipes_es.yml via GitLocalize 2020-08-06 07:47:06 +00:00
TheBusyBiscuit
5585e50230 Translate messages_es.yml via GitLocalize 2020-08-06 07:47:05 +00:00
Luu7
4a45757a53 Translate messages_es.yml via GitLocalize 2020-08-06 07:47:03 +00:00
Luu7
33d802b940 Translate researches_es.yml via GitLocalize 2020-08-06 07:47:02 +00:00
dniym
0f7bb6703c
Merge pull request #16 from TheBusyBiscuit/master
asdf
2020-08-05 23:32:25 -04:00
TheBusyBiscuit
8d7d157503 Improved documentation 2020-08-06 00:54:49 +02:00
TheBusyBiscuit
ef01c85888 Some refactoring, requested changes 2020-08-06 00:30:33 +02:00
TheBusyBiscuit
dde0ab7de6
[CI skip] Merge pull request #2197 from TheBusyBiscuit/gitlocalize-12544
Updated hungarian translations
2020-08-05 23:39:44 +02:00
TheBusyBiscuit
94843c79c0
[CI skip] Merge pull request #2196 from TheBusyBiscuit/gitlocalize-12540
Update Japanese translation
2020-08-05 23:39:18 +02:00
TheBusyBiscuit
a032d151f1
[CI skip] Merge pull request #2195 from TheBusyBiscuit/gitlocalize-12539
Updated TR localization
2020-08-05 23:38:52 +02:00
TheBusyBiscuit
e758be8d3c
[CI skip] Merge pull request #2194 from TheBusyBiscuit/gitlocalize-12538
Tagalog/Filipino Translation Update
2020-08-05 23:38:28 +02:00
TheBusyBiscuit
063dd601f7
[CI skip] Merge pull request #2193 from TheBusyBiscuit/gitlocalize-12537
Updated german translations
2020-08-05 23:38:02 +02:00
András Marczinkó
7f1a300f38 Translate messages_hu.yml via GitLocalize 2020-08-05 21:36:37 +00:00
poma123
f89f3a35bb Translate messages_hu.yml via GitLocalize 2020-08-05 21:36:36 +00:00
András Marczinkó
9594046bd5 Translate recipes_hu.yml via GitLocalize 2020-08-05 21:36:35 +00:00
bito-blosh
bb67155add Translate messages_ja.yml via GitLocalize 2020-08-05 15:38:08 +00:00
TheBusyBiscuit
c2cc7ab96c Translate messages_ja.yml via GitLocalize 2020-08-05 15:38:07 +00:00
LinoxGH
cd7a94516a Translate messages_tr.yml via GitLocalize 2020-08-05 15:06:58 +00:00
Scott Gomez Andoy
a0fe200948 Translate messages_tl.yml via GitLocalize 2020-08-05 14:54:16 +00:00
TheBusyBiscuit
3d8e01e6f2 Translate messages_de.yml via GitLocalize 2020-08-05 14:52:33 +00:00
TheBusyBiscuit
46a01c368f
Merge pull request #2192 from poma123/fix/brewing
Fixed prevent Slimefun items from being added to a Brewing Stand
2020-08-05 16:49:54 +02:00
TheBusyBiscuit
32849ca563
Merge branch 'master' into refactoring/block-energy 2020-08-05 16:45:34 +02:00
TheBusyBiscuit
7c3599c862 [CI skip] Reduced technical debt 2020-08-05 16:44:43 +02:00
TheBusyBiscuit
c168497e79 [CI skip] Reduced technical debt 2020-08-05 13:31:35 +02:00
poma123
9454c890ea Refactoring 2020-08-05 13:02:35 +02:00
poma123
6de4130d05 Fixed prevention when brewing with slimefun items 2020-08-05 12:41:48 +02:00
dniym
5815669b04
Merge pull request #15 from TheBusyBiscuit/master
asdf
2020-08-04 17:16:14 -04:00
TheBusyBiscuit
f50d1d2faa Big performance improvements to Enhanced Furnaces when using Paper 2020-08-04 20:15:21 +02:00
TheBusyBiscuit
c56ebe9c23
Merge branch 'master' into IcePick 2020-08-04 19:12:00 +02:00
TheBusyBiscuit
18036aa181
Added a new entry to SlimefunItems.java 2020-08-04 19:07:00 +02:00
TheBusyBiscuit
f8a988261f
Fixed typo 2020-08-04 19:03:20 +02:00
TheBusyBiscuit
3adb634d8b
Make it not override the vanilla item anymore 2020-08-04 19:02:53 +02:00
TheBusyBiscuit
f9e9a7c491
Updated research id to not break compatibility 2020-08-04 19:00:38 +02:00
TheBusyBiscuit
77d10e4015
[CI skip] Merge pull request #2182 from TheBusyBiscuit/renovate/me.clip-placeholderapi-2.x
Update dependency me.clip:placeholderapi to v2.10.9
2020-08-04 18:35:51 +02:00
Renovate Bot
cf82201dca
Update dependency me.clip:placeholderapi to v2.10.9 2020-08-04 16:31:44 +00:00
TheBusyBiscuit
06f64725d9 Improved performance for idling Enhanced Furnaces on Paper 2020-08-04 18:00:31 +02:00
TheBusyBiscuit
9719058bbc Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2020-08-04 17:59:55 +02:00
TheBusyBiscuit
35684b60fc Optimized performance for rainbow blocks 2020-08-04 17:59:41 +02:00
TheBusyBiscuit
95b7d5b11f
[CI skip] Merge pull request #2190 from TheBusyBiscuit/gitlocalize-12527
Tagalog/Filipino Translation Update
2020-08-04 16:00:27 +02:00
TheBusyBiscuit
d80fdac23b Fixed debug fish 2020-08-04 15:49:58 +02:00
TheBusyBiscuit
b6ba6ce754 Updated all electric machines 2020-08-04 15:43:00 +02:00
Scott Gomez Andoy
927eefd63c Translate recipes_tl.yml via GitLocalize 2020-08-04 12:46:42 +00:00
TheBusyBiscuit
bc387ee47a Updated EnergyNet code 2020-08-04 13:50:22 +02:00
TheBusyBiscuit
368d2f5798 Move block energy code to EnergyNetComponent 2020-08-04 13:29:45 +02:00