SoSeDiK
|
86d94a3122
|
Translate researches_ru.yml via GitLocalize
|
2020-10-12 14:26:49 +00:00 |
|
Sfiguz7
|
2a8c0f7f82
|
Moved imports.
|
2020-10-12 16:25:22 +02:00 |
|
TheBusyBiscuit
|
9b1d6367b3
|
Some lore changes
|
2020-10-12 16:01:27 +02:00 |
|
TheBusyBiscuit
|
87d319cd02
|
Merge pull request #2382 from LinoxGH/EnergyConnector
Energy Connectors
|
2020-10-12 15:49:50 +02:00 |
|
TheBusyBiscuit
|
2e83b726bc
|
[CI skip] Removed author tags from high-cohesion classes
|
2020-10-12 15:49:33 +02:00 |
|
CURVX
|
b778e2158b
|
Merge pull request #2 from Slimefun/master
[CI Skip] Update fork
|
2020-10-12 19:04:58 +05:30 |
|
TheBusyBiscuit
|
160c68b378
|
[CI skip] Refactoring and documentation
|
2020-10-12 15:04:27 +02:00 |
|
Sfiguz7
|
6cab415e37
|
Formatting, nerfed Basalt -> Lava
|
2020-10-12 14:10:16 +02:00 |
|
TheBusyBiscuit
|
612aad5d95
|
Fixes #2424
|
2020-10-12 12:11:28 +02:00 |
|
TheBusyBiscuit
|
3b7dd68164
|
Fixes #2450
|
2020-10-12 11:52:23 +02:00 |
|
TheBusyBiscuit
|
14e18d2962
|
Fixes #2455
|
2020-10-12 11:47:13 +02:00 |
|
Sfiguz7
|
fd58155a18
|
Added blackstone and basalt -> lava to crucibles
|
2020-10-12 09:10:52 +02:00 |
|
TheBusyBiscuit
|
f1dea4cab9
|
Merge pull request #2451 from CURVX/master
Fix #2433
|
2020-10-11 18:09:23 +02:00 |
|
TheBusyBiscuit
|
c65687acf7
|
[CI skip] Updated changelog
|
2020-10-11 18:09:03 +02:00 |
|
CURVX
|
a9e64dbcfc
|
Resolves #2433
|
2020-10-11 19:58:17 +05:30 |
|
CURVX
|
064453346d
|
Resolves #2433
|
2020-10-11 19:49:34 +05:30 |
|
TheBusyBiscuit
|
c099f0bed4
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2020-10-11 15:41:47 +02:00 |
|
TheBusyBiscuit
|
df4a87d9fa
|
[Ci skip] A little bit of refactoring
|
2020-10-11 15:41:42 +02:00 |
|
CURVX
|
8f34d84917
|
Merge pull request #1 from Slimefun/master
[CI skip] Update fork
|
2020-10-11 18:20:36 +05:30 |
|
LinoxGH
|
8eeb582ea3
|
Changed connector recipe.
|
2020-10-11 15:36:07 +03:00 |
|
TheBusyBiscuit
|
15884c65aa
|
Merge pull request #2435 from TheSilentPro/master fixes #2420 fixes #2422
Stop unwanted actions from StrangeNetherGoo and Heavy Cream
|
2020-10-11 13:46:40 +02:00 |
|
TheBusyBiscuit
|
bbe196e838
|
[CI skip] Updated changelog
|
2020-10-11 13:45:53 +02:00 |
|
TheBusyBiscuit
|
b4b18f548f
|
[CI skip] Reduced technical debt
|
2020-10-11 12:48:51 +02:00 |
|
Silent
|
7177946aae
|
Changes pt2
|
2020-10-11 12:44:15 +02:00 |
|
TheBusyBiscuit
|
b80bc87ddc
|
Merge pull request #2440 from LinoxGH/ExplosivePickFix Fixed #2439
|
2020-10-11 12:27:27 +02:00 |
|
Silent
|
2902f74d10
|
Changes
|
2020-10-11 12:14:58 +02:00 |
|
LinoxGH
|
4980b078a1
|
Update BlockListener.java
|
2020-10-11 08:50:04 +03:00 |
|
LinoxGH
|
7af1e8144d
|
Update ExplosiveTool.java
|
2020-10-11 08:48:27 +03:00 |
|
TheBusyBiscuit
|
86b46939d1
|
[CI skip] Merge pull request #2442 from Slimefun/gitlocalize-13359
new translations
|
2020-10-11 01:36:41 +02:00 |
|
TheBusyBiscuit
|
2c9dcbb5dc
|
[CI skip] Merge pull request #2441 from Slimefun/gitlocalize-13358
new translations
|
2020-10-11 01:36:28 +02:00 |
|
TheBusyBiscuit
|
bc6ac0a4d1
|
[CI skip] Added Tape Measure Unit Tests
|
2020-10-11 01:27:38 +02:00 |
|
Pierre
|
b7da3d816d
|
Translate messages_fr.yml via GitLocalize
|
2020-10-10 23:22:55 +00:00 |
|
Pierre
|
1fb8a2f66c
|
Translate researches_fr.yml via GitLocalize
|
2020-10-10 23:22:38 +00:00 |
|
TheBusyBiscuit
|
4a91e99be6
|
[CI skip] Restructuring test classes
|
2020-10-11 01:02:39 +02:00 |
|
LinoxGH
|
957bcd9a3a
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/BlockListener.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2020-10-11 02:01:54 +03:00 |
|
LinoxGH
|
d3c0a110a9
|
Changed capacitor recipe.
|
2020-10-11 00:31:06 +03:00 |
|
LinoxGH
|
ad505b6cef
|
Merge branch 'master' into EnergyConnector
|
2020-10-11 00:26:43 +03:00 |
|
LinoxGH
|
6082abb9b6
|
Merge branch 'master' into ExplosivePickFix
|
2020-10-11 00:23:59 +03:00 |
|
LinoxGH
|
fdd33f9182
|
Update CHANGELOG.md
|
2020-10-11 00:20:02 +03:00 |
|
LinoxGH
|
bf3e6754cc
|
Changed event priorities.
|
2020-10-11 00:19:15 +03:00 |
|
LinoxGH
|
05d7ab5643
|
Update ExplosiveTool.java
|
2020-10-11 00:12:42 +03:00 |
|
Silent
|
dfe33b3534
|
Didn't know this existed
|
2020-10-10 22:05:50 +02:00 |
|
TheBusyBiscuit
|
bf25fc0b9d
|
[CI skip] Added Unit Tests for new Item Settings
|
2020-10-10 21:55:54 +02:00 |
|
TheBusyBiscuit
|
594d322df2
|
[CI skip] Added EnumSetting
|
2020-10-10 21:20:25 +02:00 |
|
TheBusyBiscuit
|
a44f2fa626
|
[CI skip] Some cleanup
|
2020-10-10 20:46:17 +02:00 |
|
Silent
|
f9928e5e10
|
Add requested changes
|
2020-10-10 20:20:08 +02:00 |
|
TheBusyBiscuit
|
fa1cecef2f
|
[CI skip] Merge pull request #2436 from Slimefun/gitlocalize-13355
Updated bulgarian translations
|
2020-10-10 19:44:00 +02:00 |
|
TheBusyBiscuit
|
457153371c
|
[CI skip] I need coffee
|
2020-10-10 19:40:45 +02:00 |
|
TheBusyBiscuit
|
6ec13239c4
|
[CI skip] Merge pull request #2438 from Slimefun/gitlocalize-13357
Updated german translations
|
2020-10-10 19:37:59 +02:00 |
|
TheBusyBiscuit
|
0457c9cd24
|
[CI skip] Exclude language updates from discord
|
2020-10-10 19:37:35 +02:00 |
|