Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-29 05:55:57 +01:00
Code Issues Projects Releases Wiki Activity
1,091 Commits 6 Branches 104 Tags 7.9 MiB
e9e7042aed
Commit Graph

398 Commits

Author SHA1 Message Date
Lukas Rieger (Blue)
0f58b7409b
Revert "Fix PR #395 ^^" 
This reverts commit 7612998bda.
 2023-02-25 22:42:45 +01:00
Lukas Rieger (Blue)
7612998bda
Fix PR #395 ^^ 2023-02-25 22:03:31 +01:00
nlog
b9a3c2849a
Modify setFrozen behavior (#395) 2023-02-25 21:59:04 +01:00
Lukas Rieger (Blue)
631c409f79
Keep webserver running if bluemap disables due to no active maps being configured 2023-02-25 12:28:07 +01:00
Lukas Rieger (Blue)
892506f2f9
Remove uneccesary lock, fix double server header, organize packages and class-names 2023-02-24 13:55:21 +01:00
Lukas Rieger (Blue)
0123041925
Fix webserver only working after plugin reload 2023-02-23 10:54:17 +01:00
KeksToGo
578890757e
Translated To Turkish. (#393) 
* Create tr.conf

* Update settings.conf

* Update tr.conf
 2023-02-23 01:22:53 +01:00
Lukas Rieger (Blue)
f4c6adc685
Rewrite integrated webserver to be non-blocking 2023-02-22 16:19:34 +01:00
Lukas Rieger (Blue)
75e987f3c8
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2023-02-15 21:10:46 +01:00
Lukas Rieger (Blue)
a0f34d3d96
Prevent the integrated webserver from sending raw php files 2023-02-15 21:10:23 +01:00
Dycool
e81473b282
Update portuguese translation (#391) 
* Update pt_PT.conf

Update portuguese translation

* Update pt_PT.conf

Update portuguese translation
 2023-02-13 22:24:51 +01:00
Lukas Rieger (Blue)
bce498955f
Fix sorting being case-sensitive 2023-02-11 12:07:33 +01:00
Lukas Rieger (Blue)
9c4bcc100f
Fix sorting by name for player-markers 2023-02-11 10:38:21 +01:00
Antti Ellilä
cc01585e07
Update finnish translation (#390) 2023-02-08 18:48:03 +01:00
Lukas Rieger (Blue)
0ac4a933a6
Fix menu-scrolling not working in freeflight mode 2023-02-08 18:47:10 +01:00
Lukas Rieger (Blue)
66058dbe5f
Fix zoom-buttons not showing 2023-02-08 18:34:22 +01:00
Lukas Rieger (Blue)
256e80bb62
Fix sorting value of 0 now not working ... duh 2023-02-08 17:43:12 +01:00
Lukas Rieger (Blue)
277af6b498
Set default map-sorting to be very late, so the map wont be first if its settings.json could not be loaded 2023-02-08 17:40:12 +01:00
Lukas Rieger (Blue)
141d46a513
Add loading message and improve webapp-error if a map could not be loaded 2023-02-08 17:35:47 +01:00
Lukas Rieger (Blue)
fdb846a435
Remove the marker-examples alltogether 
Makes the default map.conf more clean,
and makes people read the wiki ;p
 2023-02-08 13:08:17 +01:00
Lukas Rieger (Blue)
38932cea28
Add sorting and listed properties to map.conf example markers 2023-02-08 12:53:56 +01:00
Lukas Rieger (Blue)
87c868b1a9
Implement unlisting markers and improve marker-list styling 2023-02-07 19:43:59 +01:00
Lukas Rieger (Blue)
6ea755d366
Implement marker and marker-set sorting 2023-02-07 17:09:01 +01:00
KaRiLaA
3aa4b4a995
Update UA and RU translation (#389) 2023-02-06 09:27:50 +01:00
TechnicJelle
b454d15264
Changed steve.png to be in line with the new style (#383) 2023-01-15 16:37:01 +01:00
Lukas Rieger (Blue)
e5729a767c
Fix bug that updates the settings.json if the webapp is being disabled 2023-01-15 11:43:22 +01:00
Lukas Rieger (Blue)
45331b8103
Still start sorting-index with 0 :) 2023-01-06 19:10:41 +01:00
Lukas Rieger (Blue)
3defd493d2
Improve default map config generation if there are more than one dimensions of the same type 2023-01-06 19:04:01 +01:00
Lukas Rieger (Blue)
1fa8bb5e4c
Add light-reload command to reload bluemap without reloading all block-resources 2023-01-03 16:03:07 +01:00
Lukas Rieger (Blue)
3b37be432c
Tentative fix for webserver not closing for 10 seconds when bluemap unloads 2023-01-03 16:01:24 +01:00
Lukas Rieger (Blue)
47117c2742
Fix index.php meta-resolving not working with query-parameters 2023-01-01 12:23:47 +01:00
Lukas Rieger (Blue)
b60984221c
Add --host parameter to vite dev-server 2023-01-01 12:19:47 +01:00
Lukas Rieger (Blue)
34a67c7c44
Loosen the camera angle bounds 2022-12-31 10:35:58 +01:00
Owen Diffey
18b4b0b220
fix: Scrolling to zoom in embedded map causes containing page to scroll (#376) 2022-12-31 09:44:00 +01:00
Lukas Rieger (Blue)
4bef77d54b
Reformat lang/settings.conf 2022-12-29 20:22:21 +01:00
Lukas Rieger (Blue)
e06ff81195
Add zoom-buttons to the webapp 2022-12-29 20:03:03 +01:00
Lukas Rieger (Blue)
eeabc2135c
Move assets out of the live folder because it makes absolutely no sense for them to be there 2022-12-29 17:54:17 +01:00
Lukas Rieger (Blue)
9560024eb5
Add abillity to add holes to shape and extrude markers 2022-12-29 17:49:08 +01:00
ff98sha
e21ec5bdae
Update zh_CN translation (#374) 
Update zh_CN translation to 3.7
 2022-12-24 17:05:11 +01:00
Lukas Rieger (Blue)
67cb033d1c
Use single-quotes in php to avoid accidental variable substitution 2022-12-22 22:34:28 +01:00
Lukas Rieger (Blue)
5124e613c2
Update ThreeJS to latest 2022-12-20 00:39:13 +01:00
Lukas Rieger (Blue)
f274ceeefe
Fix french lang config and menu not closing correctly 2022-12-19 22:48:10 +01:00
Lukas Rieger (Blue)
74ace4df18
Update webapp to Vue3 2022-12-19 21:54:30 +01:00
dependabot[bot]
b04894942e
Bump scss-tokenizer and node-sass in /BlueMapCommon/webapp (#365) 
Bumps [scss-tokenizer](https://github.com/sasstools/scss-tokenizer) to 0.4.3 and updates ancestor dependency [node-sass](https://github.com/sass/node-sass). These dependencies need to be updated together.


Updates `scss-tokenizer` from 0.2.3 to 0.4.3
- [Release notes](https://github.com/sasstools/scss-tokenizer/releases)
- [Commits](https://github.com/sasstools/scss-tokenizer/compare/v0.2.3...v0.4.3)

Updates `node-sass` from 6.0.1 to 8.0.0
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v6.0.1...v8.0.0)

---
updated-dependencies:
- dependency-name: scss-tokenizer
  dependency-type: indirect
- dependency-name: node-sass
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-12-18 18:43:56 +01:00
Lukas Rieger (Blue)
02411460ab
Update node 2022-12-18 18:03:04 +01:00
Lukas Rieger (Blue)
6a23e864de
Update some stuff 2022-12-18 17:42:32 +01:00
Lukas Rieger (Blue)
039320bf51
Update browserlist 2022-12-18 17:35:18 +01:00
Lukas Rieger (Blue)
bdaf24d2f7
Rename BlueMapVue to webapp 2022-12-18 17:30:00 +01:00
Lukas Rieger (Blue)
8fad71ac74
Move BlueMapWeb code into BlueMapVue 2022-12-18 17:22:56 +01:00
Lukas Rieger (Blue)
bd52fb6eb7
Move BlueMapVue and BlueMapWeb into the main repo 2022-12-18 17:07:19 +01:00
Lukas Rieger (Blue)
6642c11742
Move BlueMapVue and BlueMapWeb into the main repo 2022-12-18 16:58:37 +01:00
Lukas Rieger (Blue)
7918035abd
Update BlueMapAPI and BlueMapVue 2022-12-18 16:28:33 +01:00
Lukas Rieger (Blue)
df5acb6c53
Improve inhabited time check 2022-12-17 15:12:23 +01:00
Lukas Rieger (Blue)
c7fc230dcf
Fix inhabited time check 2022-12-17 15:10:22 +01:00
Lukas Rieger (Blue)
cf93cb56c4
Improve min-inhabited-time calculations and add hidden radius setting 2022-12-17 15:06:18 +01:00
Lukas Rieger (Blue)
2a94b0faab
Fix live-interface paths 2022-12-13 17:39:12 +01:00
Lukas Rieger (Blue)
6d53bce0dd
Add stuff 2022-12-13 16:54:31 +01:00
Lukas Rieger (Blue)
11306ec9cf
Test making BlueMapCommon and BlueMapCore available to jitpack 2022-12-04 00:18:45 +01:00
Lukas Rieger (Blue)
1368f86d13
Also reset texture-gallery on map-purge 2022-11-28 20:38:34 +01:00
Lukas Rieger (Blue)
1771768afe
Add a connection-timeout as this might resolve cases where the webserver is hanging for a long time 2022-11-14 17:24:26 +01:00
Lukas Rieger (Blue)
51cdcb534b
Push BlueMapVue 2022-11-10 15:48:28 +01:00
Lukas Rieger (Blue)
575c921b44
Push BlueMapVue 2022-11-09 16:59:40 +01:00
Lukas Rieger (Blue)
66ce77ccc9
Fix bug in api implementation returning the wrong player-visibillity 2022-11-07 11:48:28 +01:00
Lukas Rieger (Blue)
45b02d9f5c
Push BlueMapVue 2022-11-03 13:54:01 +01:00
Lukas Rieger (Blue)
6c18fde7b0
Push BlueMapVue 2022-10-27 23:50:35 +02:00
Mark-225
1f3ebafd10
More accurate player head layers (#353) 2022-10-23 19:38:42 +02:00
Lukas Rieger (Blue)
8faa067634
Fix default config-template value for caves 2022-10-23 00:56:35 +02:00
Lukas Rieger (Blue)
ff100e2656
Add option to use ocean-floor-heightmap to improve cave-detection 2022-10-23 00:52:39 +02:00
Lukas Rieger (Blue)
9a989149fc
Push BlueMapVue to fix #352 2022-10-21 23:12:48 +02:00
Lukas Rieger (Blue)
22796af0f8
Push BlueMapVue to fix #295 2022-10-21 22:22:11 +02:00
Lukas Rieger (Blue)
3243c0c36e
Push BlueMapVue 2022-10-21 19:06:25 +02:00
Lukas Rieger (Blue)
de5d8a4689
Push BlueMapVue for theme-changes 2022-10-16 00:38:13 +02:00
Lukas Rieger (Blue)
eec491da29
Push BlueMapVue. Fixes: #160 2022-10-15 00:39:22 +02:00
Lukas Rieger (Blue)
81f309b0be
Create directories with symlinks in mind, fixes #349 2022-10-14 10:24:19 +02:00
Lukas Rieger (Blue)
a8346a24ba
Push BlueMapVue 2022-10-04 20:41:27 +02:00
Lukas Rieger (Blue)
5624c5f216
Fix some issues with the purge command 2022-10-04 20:40:38 +02:00
Lukas Rieger (Blue)
d7eb9e8083
Fix outdated warning message text 2022-10-02 20:50:20 +02:00
Lukas Rieger (Blue)
32a4f4a06b
Push BlueMapVue 2022-10-01 12:50:44 +02:00
Lukas Rieger (Blue)
9afcb33790
Push BlueMapVue and add version to index.html on web-app creation 2022-09-12 12:02:36 +02:00
Lukas Rieger (Blue)
d64353bf31
Push BlueMapVue 2022-09-09 23:14:49 +02:00
Lukas Rieger (Blue)
e8f8317d52
Fix/improve handling of two exceptions 2022-09-08 12:29:11 +02:00
Lukas Rieger (Blue)
d9df6989ff
Add option to hide players if they are in the shadows *mystic sound here* 2022-09-02 23:10:51 +02:00
Lukas Rieger (Blue)
37c125c698
Push BlueMapVue 2022-09-02 22:09:32 +02:00
Lukas Rieger (Blue)
d93610cbd1
Push BlueMapVue 2022-08-31 15:09:12 +02:00
Lukas Rieger (Blue)
60a8f5f98e
Close storages that failed to load and misconfigured maps dont stop loading the others 2022-08-27 15:08:17 +02:00
Lukas Rieger (Blue)
478ccf52a5
Update BlueMapAPI + Implementation 2022-08-25 15:46:37 +02:00
Lukas Rieger (Blue)
471183b419
Add some SQL-Storage settings and tweak some connection-pool settings 2022-08-21 00:28:40 +02:00
Lukas Rieger (Blue)
efd365daeb
Fix issue with checking render-playerlimit 2022-08-21 00:26:34 +02:00
Lukas Rieger (Blue)
4c9b45e6eb
Fix sql-config-template, remove debug-log and add map-id to cli-filewatcher output 2022-08-18 18:06:55 +02:00
Lukas Rieger (Blue)
eac01bb06e
Change y to z for start-pos config 2022-08-18 16:08:33 +02:00
Lukas Rieger (Blue)
f80e7ea546
Fix config template for start-pos 2022-08-18 16:06:00 +02:00
Lukas Rieger (Blue)
a3264e1c0b
Push BlueMapVue 2022-08-18 14:18:20 +02:00
Lukas Rieger (Blue)
bd88b2979d
Remove the user & password settings for database, as they should be added to the jdbc-connection string 2022-08-17 23:27:56 +02:00
Lukas Rieger (Blue)
89ca7053dd
Fix map-region filter limits on the z-Axis based on minY instead of minZ 2022-08-17 22:38:07 +02:00
Lukas Rieger (Blue)
9e6cdc75de
Push BlueMapVue 2022-08-17 14:46:53 +02:00
Lukas Rieger (Blue)
29e4f4c7a9
Push BlueMapVue 2022-08-16 01:11:48 +02:00
Lukas Rieger (Blue)
83806641ac
Add minimum inhabitedTime configuration to maps 2022-08-15 11:43:16 +02:00
Lukas Rieger (Blue)
f5ef2a8cdc
Push BlueMapVue 2022-08-15 10:49:34 +02:00
Lukas Rieger (Blue)
101784b032
Push BlueMapVue 2022-08-15 10:03:22 +02:00
Lukas Rieger (Blue)
c3a26abc3b
Add option to disable saving the hires-layer 2022-08-15 00:19:24 +02:00
Lukas Rieger (Blue)
1c4949b3a8
Push BlueMapVue 2022-08-14 21:48:51 +02:00
Lukas Rieger (Blue)
cf5a0da221
Fix IndexOutOfBoundsException if CombinedRenderTask is almost finished 2022-08-14 21:30:15 +02:00
Lukas Rieger (Blue)
42e53f0135
Fixes for lowres lighting and map-purging/saving, tweak default settings 2022-08-14 20:36:50 +02:00
Lukas Rieger (Blue)
413151e9ed
Merge branch 'feature/lowres' 2022-08-12 18:11:26 +02:00
Lukas Rieger (Blue)
562deb17a3
Finalize new lowres tiles implementation 2022-08-12 18:11:11 +02:00
Lukas Rieger (Blue)
44906f889b
Small performance improvements (resolving world-ids and sql-querys) 2022-08-09 22:35:21 +02:00
Lukas Rieger (Blue)
18d71cb74d
Push BlueMapVue 2022-08-08 21:33:49 +02:00
Lukas Rieger (Blue)
7d14ca4a29
Merge branch 'master' into feature/lowres 2022-08-08 21:29:50 +02:00
Lukas Rieger (Blue)
81574c5176
Rewrite lowres tiles with mutiple LODs 2022-08-07 20:32:55 +02:00
Lukas Rieger (Blue)
e2f1f10fdb
Fix hires-slider-default being controlled by the lowres-default setting 2022-08-07 08:35:16 +02:00
Lukas Rieger (Blue)
bddd455581
Fix some map-purging issues 2022-08-06 07:05:29 +02:00
Lukas Rieger (Blue)
c289fd8c13
Never overwrite existing world-ids 2022-08-03 17:35:16 +02:00
Lukas Rieger (Blue)
dafabac5bb
Add a way to register externally rendered or static maps without a world 2022-08-03 12:54:03 +02:00
Lukas Rieger (Blue)
d4f00682a6
Fix web-app api throwing an error and add full errors to the StateDumper 2022-08-02 18:14:38 +02:00
Lukas Rieger (Blue)
17f502928c
Update BlueMapVue 2022-08-01 16:34:30 +02:00
Lukas Rieger (Blue)
fd519e6bf7
Update BlueMapAPI 2022-08-01 12:53:58 +02:00
Lukas Rieger (Blue)
ffc472ce84
Fix not loading textures if they are outside the block(s) folder 2022-08-01 00:15:39 +02:00
Lukas Rieger (Blue)
bc8e52abbf
Use int for ports instead of short to support full port-range 2022-07-31 22:34:18 +02:00
Lukas Rieger (Blue)
77b7854d0f
Fix typo 2022-07-31 22:00:30 +02:00
Lukas Rieger (Blue)
5271025933
Fix name-format in the sql.conf 2022-07-31 21:58:10 +02:00
Lukas Rieger (Blue)
330f2cdbe2
Pretty-print main settings file, to make manual editing easier 2022-07-31 18:58:59 +02:00
Lukas Rieger (Blue)
ae992419bb
Fix Caffeine using wrong thread-pool and add sorting to initial map-update 2022-07-31 18:45:30 +02:00
Lukas Rieger (Blue)
cef202ebba
Switch to tiles with added wrapper-object for future additional data 2022-07-31 18:06:57 +02:00
Lukas Rieger (Blue)
e9785562d1
Update webapp 2022-07-31 12:39:45 +02:00
Lukas Rieger (Blue)
be04097ec5
Write markers to map-storage and add option to periodically update markers and players to storage 2022-07-30 15:31:42 +02:00
Lukas Rieger (Blue)
ca1d5cb50b
Add option to configure marker-sets in the map-configs 2022-07-30 13:24:07 +02:00
Lukas Rieger (Blue)
2d57b1a32a
Fix accidentally pushed unfinised code >_> 2022-07-28 23:05:47 +02:00
Lukas Rieger (Blue)
cd3a607022
Push BlueMapAPI 2022-07-28 22:58:16 +02:00
Lukas Rieger (Blue)
879e4f993d
Update BlueMapAPI 2022-07-27 20:31:14 +02:00
Lukas Rieger (Blue)
98236aaba2
Remove obsolete release.properties file 2022-07-27 15:12:53 +02:00
Lukas Rieger (Blue)
95e3211a4a
Change git-hash detection, fix ci 2022-07-26 22:04:01 +02:00
Lukas Rieger (Blue)
4da988d31c
Implement BlueMapAPI v2 2022-07-24 12:10:00 +02:00
Lukas Rieger (Blue)
c4e7349c54
Add player-filter to plugin-state 2022-07-04 13:07:56 +02:00
Lukas Rieger (Blue)
03f58c7739
Moving live-player-endpoint to maps/[mapid]/live/player, webroot/data is now webroot/maps, fixed color-css-alpha format 2022-06-27 01:13:48 +02:00
Lukas Rieger (Blue)
8e8934a8c4
Split and move settings.json for each map 2022-06-06 22:51:26 +02:00
Lukas Rieger (Blue)
a4ce85b9f8
Merge branch 'master' into feature/v2 2022-06-05 22:03:17 +02:00
Lukas Rieger (Blue)
ef5e2c08aa
Fix possible int-overflow on radius-update 2022-06-03 18:57:43 +02:00
Lukas Rieger (Blue)
b92536da64
Working on moving settings.json 2022-06-03 18:52:15 +02:00
Lukas Rieger (Blue)
79a12d4d80
Automatic mod-resource-loading, loading fabric netsted jars and more 2022-06-01 00:03:35 +02:00
Lukas Rieger (Blue)
f98376fe27
Fix parent and texture-variable baking 2022-05-29 02:34:26 +02:00
Lukas Rieger (Blue)
7389cb1a16
Completely rework ResourcePack and resource-loading 2022-05-28 21:55:41 +02:00
Lukas Rieger (Blue)
4e7deb2562
Fix missing word 2022-04-24 19:01:28 +02:00
Lukas Rieger (Blue)
92ac2177cd
Fix falsely considering regions outside of the defined render-boundaries 2022-04-24 18:53:06 +02:00
Lukas Rieger (Blue)
2f6238349c
Fix render-thread-calculation can still be below 1 2022-04-24 16:00:13 +02:00
Lukas Rieger (Blue)
492573c866
Fix config formatting and render-thread-calculation 2022-04-24 15:56:03 +02:00
Lukas Rieger (Blue)
e555d558b7
Refactored config management 2022-04-20 22:54:27 +02:00
Lukas Rieger (Blue)
3f049d0523
Require Java 11 2022-01-16 14:20:27 +01:00
Lukas Rieger (Blue)
cd008a32f0
Update gradle, switch to gradle-kotlin where possible (forge doesnt work), improve build-script setup 2022-01-15 01:18:02 +01:00
Lukas Rieger (Blue)
0929678d3b
Merge branch 'master' into feature/sql 2021-12-02 14:11:37 +01:00
Lukas Rieger (Blue)
6186b16e8d
Push BlueMapVue and remove wrong comment from code 2021-12-02 14:10:14 +01:00