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

4691 Commits

Author SHA1 Message Date
Daniel Walsh
53dea5e195 Some good old micro-optimisations 2020-09-07 22:38:23 +01:00
LinoxGH
956d8ed078
Did the requested changes. 2020-09-07 18:47:51 +03:00
TheBusyBiscuit
239df5cc30
[CI skip] Updated change log 2020-09-07 12:45:27 +02:00
LinoxGH
cdd7dc9232
Forgot to change a small part. 2020-09-07 13:38:12 +03:00
LinoxGH
7cd2e53bf1
Possibly fixes #2296. 2020-09-07 13:22:59 +03:00
TheBusyBiscuit
cd84930391 [CI skip] Moved Slimefun repository 2020-09-06 17:19:17 +02:00
TheBusyBiscuit
5c0aba7692 [CI skip] Moved Slimefun repository 2020-09-06 17:19:02 +02:00
TheBusyBiscuit
37576bb397
Merge pull request #2292 from OmerBenGera/patch-1
Fixed teleporters not functioning if the teleport event is cancelled
2020-09-06 11:39:25 +02:00
Ome_R
490db0d719
Fixed teleporters not functioning if the teleport event is cancelled 2020-09-06 12:22:37 +03:00
TheBusyBiscuit
575c2d0796
[CI skip] Merge pull request #2291 from TheBusyBiscuit/gitlocalize-12877
Update chinese translation
2020-09-06 10:30:05 +02:00
Nameless
3b9a42713a Translate researches_zh-CN.yml via GitLocalize 2020-09-06 04:24:14 +00:00
Rothes
d1b9092cfd Translate messages_zh-CN.yml via GitLocalize 2020-09-06 04:24:12 +00:00
Nameless
eb3b856a4e Translate messages_zh-CN.yml via GitLocalize 2020-09-06 04:24:11 +00:00
TheBusyBiscuit
4ef4332ffa Translate messages_zh-CN.yml via GitLocalize 2020-09-06 04:24:10 +00:00
TheBusyBiscuit
be5f1ed8ee
Merge pull request #2285 from NCBPFluffyBear/multitool-offhand-fix
Multitool offhand hunger consumption fix
2020-09-05 22:15:47 +02:00
TheBusyBiscuit
ff99da0b7d
[Ci skip] Updated change log 2020-09-05 22:15:40 +02:00
FluffyBear
6e33549006 Got rid of the extra imports 2020-09-05 15:11:29 -05:00
FluffyBear
069b183b68 Changed it back 2020-09-05 15:11:08 -05:00
FluffyBear
c9fd33318e Did changes 2020-09-05 11:12:14 -05:00
TheBusyBiscuit
2791da3796 A bit redundant 2020-09-05 15:01:26 +02:00
TheBusyBiscuit
ec9133cf8a Small improvements 2020-09-05 14:45:42 +02:00
TheBusyBiscuit
8061df9b5e [CI skip] More nullability annotations 2020-09-05 13:56:56 +02:00
TheBusyBiscuit
5f897de0b0
[CI skip] Merge pull request #2287 from TheBusyBiscuit/gitlocalize-12867
messges_es
2020-09-05 09:57:06 +02:00
TheBusyBiscuit
08a829cc4d
[CI skip] Merge pull request #2288 from TheBusyBiscuit/gitlocalize-12868
researches_es
2020-09-05 09:56:26 +02:00
Luu7
1c1b2251d0 Translate researches_es.yml via GitLocalize 2020-09-04 20:21:14 +00:00
Luu7
d11145d98c Translate messages_es.yml via GitLocalize 2020-09-04 20:09:41 +00:00
FluffyBear
6f49044998 Applied fix 2020-09-04 10:20:11 -05:00
FluffyBear
6ac3c9698b Fixed dual wielding problem with shears 2020-09-04 09:29:08 -05:00
TheBusyBiscuit
c036e3aa42
[CI skip] Merge pull request #2286 from TheBusyBiscuit/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.5.10
2020-09-04 16:19:35 +02:00
Renovate Bot
ca45de1160
Update dependency org.mockito:mockito-core to v3.5.10 2020-09-04 14:18:52 +00:00
TheBusyBiscuit
120d3299ee
[CI skip] Merge pull request #2284 from TheBusyBiscuit/gitlocalize-12841
New pull request
2020-09-04 10:02:31 +02:00
TheBusyBiscuit
0c3cb5db37
[CI skip] Updated it once again 2020-09-04 10:02:20 +02:00
TheBusyBiscuit
deb9e0c711
[CI skip] Updated translator list 2020-09-04 09:57:34 +02:00
TheBusyBiscuit
129a26e1ba
[CI skip] Merge pull request #2281 from TheBusyBiscuit/gitlocalize-12830
pull updates
2020-09-04 09:56:20 +02:00
FluffyBear
55bf76799f Got rid of charge command from this branch (Missed something) 2020-09-04 00:54:53 -05:00
FluffyBear
cf1c58dd8b Got rid of charge command from this branch 2020-09-04 00:54:06 -05:00
FluffyBear
90309dabe1 Fixed multitools consuming hunger when used in offhand 2020-09-04 00:46:26 -05:00
FluffyBear
649d4797c9
Merge pull request #1 from TheBusyBiscuit/master
Update to latest
2020-09-04 00:40:03 -05:00
NinoFutur
62279981c4 Translate messages_fr.yml via GitLocalize 2020-09-03 22:17:27 +00:00
Dams_
31f7316385 Translate messages_fr.yml via GitLocalize 2020-09-03 22:17:26 +00:00
Pierre
1ee04e79b3 Translate messages_fr.yml via GitLocalize 2020-09-03 22:17:25 +00:00
Pierre
6592489aa3 Translate researches_fr.yml via GitLocalize 2020-09-03 18:23:25 +00:00
amarcais53
d22c14e5a6 Translate researches_fr.yml via GitLocalize 2020-09-03 18:23:24 +00:00
TheBusyBiscuit
c156a317a5 [CI skip] Updated change log 2020-09-03 20:06:53 +02:00
TheBusyBiscuit
26f9e5f7c6 More annotations and refactoring 2020-09-03 17:19:24 +02:00
TheBusyBiscuit
dd9962d3e2 Small improvement, many annotations 2020-09-03 12:24:49 +02:00
TheBusyBiscuit
bb4c4b3a59
[CI skip] Updated workflow 2020-09-03 10:57:03 +02:00
TheBusyBiscuit
8e682311d3
[CI skip] Merge pull request #2279 from TheBusyBiscuit/gitlocalize-12818
Update Japanese translation files.
2020-09-03 10:05:29 +02:00
TheBusyBiscuit
d12a6b7d1d
[CI skip] Added a new workflow 2020-09-03 09:59:46 +02:00
bito-blosh
2308457c01 Translate messages_ja.yml via GitLocalize 2020-09-03 05:33:00 +00:00