poma123
|
bd0f15bc95
|
Translate messages_hu.yml via GitLocalize
|
2020-10-09 14:30:38 +00:00 |
|
TheBusyBiscuit
|
3fc3770fb8
|
[CI skip] Merge pull request #2415 from Slimefun/gitlocalize-13343
Update Japanese translation files.
|
2020-10-09 14:20:28 +02:00 |
|
TheBusyBiscuit
|
a8aef2a175
|
[CI skip] Merge pull request #2416 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.01
|
2020-10-09 14:18:33 +02:00 |
|
Renovate Bot
|
06272780bf
|
Update dependency com.konghq:unirest-java to v3.11.01
|
2020-10-09 12:16:10 +00:00 |
|
bito-blosh
|
3e20911c48
|
Translate researches_ja.yml via GitLocalize
|
2020-10-09 12:13:19 +00:00 |
|
bito-blosh
|
f95a4cfd1c
|
Translate messages_ja.yml via GitLocalize
|
2020-10-09 12:13:18 +00:00 |
|
TheBusyBiscuit
|
c440fd0778
|
Translate messages_ja.yml via GitLocalize
|
2020-10-09 12:13:17 +00:00 |
|
TheBusyBiscuit
|
aab665ffea
|
Merge branch 'master' into tags
|
2020-10-09 11:46:47 +02:00 |
|
TheBusyBiscuit
|
de5db265d5
|
Merge pull request #2413 from LinoxGH/ZombiePillFix fixes #2412
Zombie pill fix
|
2020-10-08 21:20:50 +02:00 |
|
TheBusyBiscuit
|
a82eb7405a
|
[CI skip] Updated changelog
|
2020-10-08 21:20:38 +02:00 |
|
LinoxGH
|
b2833dc5c0
|
Update MagicalZombiePills.java
|
2020-10-08 21:42:57 +03:00 |
|
LinoxGH
|
0313973653
|
Merge pull request #8 from Slimefun/master
Update
|
2020-10-08 21:40:47 +03:00 |
|
TheBusyBiscuit
|
8c80ad4040
|
Cleanup
|
2020-10-08 19:05:23 +02:00 |
|
TheBusyBiscuit
|
b05977c39b
|
[CI skip] Removed imports workflow
|
2020-10-08 19:04:23 +02:00 |
|
TheBusyBiscuit
|
5aa6a8b7b1
|
Removed github token from imports workflow
|
2020-10-08 19:01:28 +02:00 |
|
TheBusyBiscuit
|
d891d182b5
|
Intentionally messed up imports
|
2020-10-08 18:53:19 +02:00 |
|
TheBusyBiscuit
|
b6624bd43a
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into tags
|
2020-10-08 18:52:21 +02:00 |
|
TheBusyBiscuit
|
6f4802f7b6
|
[CI skip] Fixed imports workflow
|
2020-10-08 18:33:01 +02:00 |
|
TheBusyBiscuit
|
20405a775b
|
[CI skip] Added Imports cleanup action
|
2020-10-08 18:11:16 +02:00 |
|
TheBusyBiscuit
|
2d00f3e704
|
Merge branch 'master' into tags
|
2020-10-08 16:16:11 +02:00 |
|
LinoxGH
|
09a40d036e
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/attributes/EnergyNetComponent.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
|
2020-10-08 16:04:01 +03:00 |
|
LinoxGH
|
40caa2d574
|
Update ResearchSetup.java
|
2020-10-08 16:02:53 +03:00 |
|
LinoxGH
|
b5c917f719
|
Fixed the lore.
|
2020-10-08 16:00:26 +03:00 |
|
LinoxGH
|
4bf08db1d1
|
Merge branch 'master' into EnergyConnector
|
2020-10-08 15:53:08 +03:00 |
|
TheBusyBiscuit
|
26066f2e6c
|
Refactoring
|
2020-10-08 14:45:21 +02:00 |
|
TheBusyBiscuit
|
01d233af4d
|
Merge pull request #2402 from NCBPFluffyBear/gps-permission-fix
GPS Control Panel and GEO Scanner access checks
|
2020-10-08 14:37:16 +02:00 |
|
TheBusyBiscuit
|
359cba3c13
|
[CI skip] Updated changelog
|
2020-10-08 14:36:58 +02:00 |
|
TheBusyBiscuit
|
793ec142d2
|
[CI skip] Merge pull request #2407 from Slimefun/code-style
Added some code-style guidelines to CONTRIBUTING
|
2020-10-08 14:35:47 +02:00 |
|
TheBusyBiscuit
|
f3e1502203
|
Added a disclaimer
|
2020-10-08 11:39:51 +02:00 |
|
TheBusyBiscuit
|
033bd3b469
|
Update CONTRIBUTING.md
|
2020-10-08 11:18:22 +02:00 |
|
TheBusyBiscuit
|
fb8ff55504
|
Added missing bracket
|
2020-10-08 10:43:14 +02:00 |
|
TheBusyBiscuit
|
f2db686aba
|
Added info about guard blocks
|
2020-10-08 00:47:19 +02:00 |
|
NCBPFluffyBear
|
90ccbb2261
|
Organized imports
|
2020-10-07 17:37:41 -05:00 |
|
NCBPFluffyBear
|
b577c1e4a3
|
Did changes
|
2020-10-07 13:45:49 -05:00 |
|
TheBusyBiscuit
|
4936c25e49
|
Horizontal whitespaces
|
2020-10-07 18:53:13 +02:00 |
|
TheBusyBiscuit
|
126ccf3d01
|
Formatting
|
2020-10-07 18:43:55 +02:00 |
|
TheBusyBiscuit
|
7c3fc99b3a
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
tags
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemSetting.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/ExplosiveTool.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfVeinMining.java
src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/implementations/tools/TestClimbingPick.java
|
2020-10-07 18:38:26 +02:00 |
|
TheBusyBiscuit
|
95084eff70
|
Added empty lines
|
2020-10-07 18:32:36 +02:00 |
|
TheBusyBiscuit
|
fc26f959b6
|
[CI skip] Small formatting correction
|
2020-10-07 18:30:21 +02:00 |
|
TheBusyBiscuit
|
ddf9016b05
|
StringBuilder
|
2020-10-07 18:28:04 +02:00 |
|
TheBusyBiscuit
|
e4ddc7c452
|
[CI skip] Enforce OTBS.
|
2020-10-07 18:27:01 +02:00 |
|
TheBusyBiscuit
|
fa2c1d9957
|
Updated code style guidelines
|
2020-10-07 18:25:33 +02:00 |
|
poma123
|
cd00848795
|
Merge branch 'master' into tags
|
2020-10-07 17:55:26 +02:00 |
|
TheBusyBiscuit
|
ed8f0e243b
|
Fixes #2405
|
2020-10-07 17:48:53 +02:00 |
|
TheBusyBiscuit
|
c3302d8cbd
|
Merge branch 'master' into tags
|
2020-10-07 17:44:27 +02:00 |
|
TheBusyBiscuit
|
9436f2ec47
|
Update CONTRIBUTING.md
|
2020-10-07 17:32:14 +02:00 |
|
TheBusyBiscuit
|
816c0a4e49
|
Updated headings
|
2020-10-07 17:23:44 +02:00 |
|
TheBusyBiscuit
|
bbb2a78a4c
|
Added some code-style guidelines to CONTRIBUTING
|
2020-10-07 17:16:33 +02:00 |
|
LinoxGH
|
eb572a1a77
|
Merge branch 'master' into EnergyConnector
|
2020-10-07 18:10:50 +03:00 |
|
TheBusyBiscuit
|
78515a3c61
|
Merge pull request #2396 from svr333/AddSticksRecipeToTableSaw
Add sticks recipe to table saw
|
2020-10-07 16:31:58 +02:00 |
|