NotMyFault
a64ff8f299
Make master build (probably)
2019-03-24 20:58:05 +01:00
Josh Knight
83bdb3c8e8
Merge pull request #11 from IntellectualSites/incendo-paste
...
Make debugpaste use Incendo Paste Viewer, rather than Hastebin.
2019-03-19 10:36:21 -04:00
Josh Knight
be41e8dea0
Merge pull request #35 from Gerrygames/master
...
fix NPE when reading sponge schematics with tile entities or entities
2019-02-01 08:47:35 -05:00
Gerrygames
e724b1f1cd
fix NPE when reading sponge schematics with tile entities or entities
2019-02-01 13:40:22 +01:00
NotMyFault
88b665f141
Update README.md
2019-01-12 18:01:14 +01:00
NotMyFault
f5e8a407cc
Create ISSUE_TEMPLATE.md
2019-01-12 18:00:39 +01:00
NotMyFault
c0c0db0d6e
Adding discord to debugpaste
2019-01-10 14:57:32 +01:00
NotMyFault
b200744d57
Cya hastebin
2019-01-10 14:46:10 +01:00
Sauilitired
33ad31454e
Make debugpaste use Incendo Paste Viewer, rather than Hastebin.
2019-01-10 04:04:52 +01:00
NotMyFault
227d6d9169
That should work this time...
2019-01-03 13:07:25 +01:00
NotMyFault
c622810671
*
2019-01-03 13:01:39 +01:00
NotMyFault
1f39257753
Update offset to match CI
2019-01-03 12:52:23 +01:00
Josh Knight
2b8afaf930
Merge pull request #10 from SirYwell/master
...
Temporary removal of tab complete listener
2019-01-03 05:18:13 -05:00
SirYwell
d4971a4e2f
Temporary removal of tab complete listener
2019-01-03 10:18:54 +01:00
NotMyFault
21a7eb806e
Update README.md
2019-01-01 23:44:02 +01:00
NotMyFault
9556f81255
Update README.md
2018-12-29 14:09:46 +01:00
NotMyFault
fa1529e4cb
Merge pull request #9 from SirYwell/master
...
fix //removenear exception for size < 1
2018-12-29 13:14:15 +01:00
SirYwell
193361ac32
fix //removenear exception for size < 1
2018-12-29 08:47:57 +01:00
NotMyFault
4198932432
Merge pull request #8 from Combustible/merge_part_2
...
Merge upstream changes through 88f22f2
2018-12-24 08:25:08 +01:00
Byron Marohn
2259f7d025
Merge upstream changes through 88f22f2e
...
This was not a straightforward merge. A new method was added upstream to:
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java
This file has been substantially changed vs upstream worldedit. I merged
things as best I could - added the new method to this interface, and
then implemented it in:
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
Unfortunately there's no easy way to test that it works - so I left a note...
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-23 19:58:49 -08:00
NotMyFault
8a742275dc
Merge pull request #7 from dordsor21/master
...
Back to HTTP because I removed the jenkins HTTP -> HTTPS rewrite.
2018-12-24 00:34:52 +01:00
dordsor21
98446f32d7
Update build.gradle
2018-12-23 23:29:30 +00:00
dordsor21
850ac10101
Merge pull request #1 from IntellectualSites/master
...
h
2018-12-23 23:29:11 +00:00
NotMyFault
d61a3ed56f
Merge pull request #6 from Combustible/fix_worldguard_repo_url
...
Update WorldGuard repo to use https
2018-12-23 23:55:43 +01:00
Byron Marohn
4d9abcdcb3
Update WorldGuard repo to use https
...
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-23 14:44:34 -08:00
NotMyFault
8d5a655a2e
Merge pull request #5 from SirYwell/master
...
change entity list to ignore player when pasting
2018-12-22 09:04:45 +01:00
SirYwell
cf96c478be
change entity list to ignore player when pasting
2018-12-22 00:46:05 +01:00
NotMyFault
74fade22a6
Merge pull request #3 from Combustible/merge_part_1
...
Merge part 1
2018-12-21 22:30:04 +01:00
Byron Marohn
801793cc12
Merge upstream changes through 7961fa58
...
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 12:13:43 -08:00
NotMyFault
3f1d807472
Merge pull request #2 from Combustible/fix_build
...
Fix build - gradle URLs & bad imports
2018-12-21 17:30:04 +01:00
Byron Marohn
dab9e9a799
Fix imports - build working again
...
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 08:09:58 -08:00
Byron Marohn
447b4e8868
Update gradle settings to new repository URL
...
Signed-off-by: Byron Marohn <combustible@live.com>
2018-12-21 08:04:08 -08:00
N0tMyFaultOG
5b38172821
Minors
2018-12-21 11:57:14 +01:00
NotMyFault
0a28059792
Merge pull request #24 from Combustible/upstream_formatting_changes
...
Restore the formatting of many things to upstream WorldEdit - no code changes
2018-12-20 21:23:59 +01:00
Byron Marohn
c0fa1602ad
Restore the formatting of many things to upstream WorldEdit - no code changes
...
This patch touches many files but changes absolutely no functionality.
The goal here is to make future merges with worldedit produce fewer
conflicts that have to be resolved.
This patch was made by painstakingly diff'ing files and copying changes
over from the last upstream merge commit (02c6f11b
2018-12-20 11:33:56 -08:00
NotMyFault
f37bd403d8
Merge pull request #23 from boy0001/1.13.2-R0.1-NBT
...
Fixing NBT
2018-12-19 16:40:23 +01:00
NotMyFault
7eac605474
Fixing NBT
2018-12-19 16:33:15 +01:00
NotMyFault
5520813ae6
Switching from IRC to Discord
...
To offer us a better possibility to help you regarding issues or bugs, join us on discord https://discord.gg/ngZCzbU
2018-12-18 21:54:17 +01:00
NotMyFault
d00b49aa1c
Merge pull request #22 from dordsor21/master
...
Fix build take 2
2018-12-17 14:49:30 +01:00
dordsor21
07c86f32ae
Definitely fix build
2018-12-17 13:47:29 +00:00
dordsor21
6d40fd88e9
Add mavenLocal high up
2018-12-17 12:48:52 +00:00
NotMyFault
50039290bc
Merge pull request #21 from dordsor21/master
...
Fix build
2018-12-17 13:33:31 +01:00
dordsor21
5be8d83ce4
Add local repo
2018-12-17 11:54:09 +00:00
dordsor21
8eabb7e507
Fix build
2018-12-17 11:43:45 +00:00
NotMyFault
7a1b75f110
Significantly improved the quality of Simplified Chinese translation
2018-12-10 16:58:27 +01:00
NotMyFault
99fb2b546c
Fixing Italian translation
2018-11-21 14:37:44 +01:00
NotMyFault
ec22c4f180
Merge pull request #19 from IronApollo/master
...
Fix for '//mask ?' resulting in pattern error
Fixes CommandSuggestionEvent
Update FaweLocalBlockQueue to support Plotsquared restrictions
2018-11-14 07:41:42 +01:00
Jesse Boyd
d27cc51844
Merge pull request #20 from N0tMyFaultOG/master
...
Updating & fixing repo
2018-11-14 16:25:17 +11:00
NotMyFault
9b1836f336
Language update 2/2
2018-11-05 16:54:31 +01:00
NotMyFault
291ce3dfd7
Adding Italian translation
2018-11-04 20:56:22 +01:00
