LinoxGH
|
35e0d44b0b
|
Some refactoring and added a material check.
|
2020-09-12 17:21:03 +03:00 |
|
poma123
|
5112fd25fa
|
Fixed merge conflicts
|
2020-09-12 13:02:12 +02:00 |
|
poma123
|
12b32b0856
|
Merge remote-tracking branch 'upstream/master' into pr/1909
|
2020-09-12 12:27:24 +02:00 |
|
TheBusyBiscuit
|
8f95cb4f84
|
[CI skip] Merge pull request #2311 from poma123/fix/typos
Fixed some typos
|
2020-09-11 20:48:20 +02:00 |
|
poma123
|
acd26b68dd
|
We can use useable anyway
|
2020-09-11 20:29:23 +02:00 |
|
poma123
|
be5f793695
|
Fixed a bunch of typos
|
2020-09-11 20:02:17 +02:00 |
|
TheBusyBiscuit
|
e2c021d270
|
Merge pull request #2310 from LinoxGH/patch-3
Changed the used sound categories.
|
2020-09-11 19:52:48 +02:00 |
|
LinoxGH
|
0177ee13dd
|
Changed the used SoundCategory.
|
2020-09-11 20:29:28 +03:00 |
|
LinoxGH
|
ca20594032
|
Added changed the used SoundCategory.
|
2020-09-11 20:27:38 +03:00 |
|
NCBPFluffyBear
|
37c0ce4ce0
|
Organized imports
|
2020-09-10 23:52:19 -05:00 |
|
NCBPFluffyBear
|
128bc65417
|
Did requested changes
|
2020-09-10 16:36:52 -05:00 |
|
NCBPFluffyBear
|
57f52f62c6
|
Did requested changes
|
2020-09-10 16:27:50 -05:00 |
|
NCBPFluffyBear
|
6b95ed0293
|
Added Charge Command
|
2020-09-10 16:02:03 -05:00 |
|
poma123
|
d22f7f31d8
|
Renamed to AsyncMachineProcessCompleteEvent
|
2020-09-10 14:36:41 +02:00 |
|
poma123
|
6e4ad1345f
|
This has to be async
|
2020-09-10 13:58:58 +02:00 |
|
TheBusyBiscuit
|
6c7af43574
|
Merge pull request #2304 from poma123/develop/machine-process-complete-event
MachineProcessCompleteEvent
|
2020-09-10 12:16:35 +02:00 |
|
TheBusyBiscuit
|
00e71904b2
|
Merge pull request #2305 from LinoxGH/patch-3
Edited markDirty() to clean connectorCache
|
2020-09-09 23:33:06 +02:00 |
|
LinoxGH
|
1b80c698c5
|
Fixed a typo.
|
2020-09-09 21:36:29 +03:00 |
|
LinoxGH
|
6d6359ce26
|
Improved the code.
|
2020-09-09 16:50:04 +03:00 |
|
poma123
|
8f34365aaa
|
Removed redundant annotations
|
2020-09-09 14:51:21 +02:00 |
|
poma123
|
87543ccb83
|
Fixed javadocs
|
2020-09-09 14:35:17 +02:00 |
|
poma123
|
a4eb852b19
|
Added annotations
|
2020-09-09 14:34:01 +02:00 |
|
poma123
|
25bd60fd0e
|
Fixed a typo
|
2020-09-09 14:26:01 +02:00 |
|
poma123
|
274c5ada2f
|
Minor improvement
|
2020-09-09 14:25:47 +02:00 |
|
poma123
|
e628ad2685
|
Added MachineProcessCompleteEvent
|
2020-09-09 14:25:20 +02:00 |
|
TheBusyBiscuit
|
f2eeadb24b
|
[CI skip] Some minor changes
|
2020-09-09 13:18:43 +02:00 |
|
TheBusyBiscuit
|
3a5c1ee22b
|
[CI skip] Removed deprecated class
|
2020-09-08 12:22:57 +02:00 |
|
TheBusyBiscuit
|
23143cd576
|
Merge pull request #2297 from LinoxGH/patch-2
Possibly fixes #2296.
|
2020-09-08 12:06:57 +02:00 |
|
TheBusyBiscuit
|
fe22c5e9ed
|
Fixes #2300 (and deprecated bStats)
|
2020-09-08 12:06:12 +02:00 |
|
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 |
|
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
|
5c0aba7692
|
[CI skip] Moved Slimefun repository
|
2020-09-06 17:19:02 +02:00 |
|
Ome_R
|
490db0d719
|
Fixed teleporters not functioning if the teleport event is cancelled
|
2020-09-06 12:22:37 +03:00 |
|
Nameless
|
3b9a42713a
|
Translate researches_zh-CN.yml via GitLocalize
|
2020-09-06 04:24:14 +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 |
|
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 |
|
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
|
120d3299ee
|
[CI skip] Merge pull request #2284 from TheBusyBiscuit/gitlocalize-12841
New pull request
|
2020-09-04 10:02:31 +02:00 |
|