Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-22 18:45:21 +01:00
Code Issues Projects Releases Wiki Activity
1,205 Commits 6 Branches 104 Tags 7.8 MiB
d5fe7175c6
Commit Graph

464 Commits

Author SHA1 Message Date
Lukas Rieger
01027af969
Update Gradle and 1.20.2 support (#479) 
* Update gradle

* Update Fabric-Loom and ForgeGradle

* Add fabric-1.20.2 implementation

* Finalize 1.20.2 update

---------

Co-authored-by: NikitaCartes <nikich98@yandex.ru>
 2023-09-27 17:39:47 +02:00
TechnicJelle
7047df73d0
Made webserver binding logging less confusing (#474) 
People often think "0.0.0.0" is the IP they should connect to when BlueMap logs `WebServer bound to: /0.0.0.0:8100`
Or they see the IPv6 address being logged, and think BlueMap is only running on IPv6.
 2023-09-07 08:41:50 +02:00
Lukas Rieger (Blue)
7156993323
Make webserver resource-closing more watertight against potential leaks 2023-09-05 14:22:30 +02:00
Lukas Rieger (Blue)
15d402cceb
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2023-08-10 16:10:06 +02:00
Lukas Rieger (Blue)
4aadaeb2e0
Fix indentation of frozen status on map list 2023-08-10 16:09:57 +02:00
TWME
87032fde81
Update zh_TW.conf (#460) 
* Update zh_TW.conf

* Create zh_TW_new.conf

* Update zh_TW.conf

* Delete zh_TW_new.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf

* Update zh_TW.conf
 2023-07-30 16:17:15 +02:00
Lukas Rieger (Blue)
0eb12a1588
Fix webapp error when player-markers are disabled 2023-07-16 02:03:54 +02:00
Lukas Rieger (Blue)
c851812f42
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2023-07-11 20:07:24 +02:00
Lukas Rieger (Blue)
074bc4a436
Fix not able to teleport to players on other worlds. Fixes: #451 2023-07-11 20:07:10 +02:00
TechnicJelle
eaac9f8f84
Translated new strings to Dutch (#453) 2023-07-09 15:33:32 +02:00
Lukas Rieger (Blue)
282b3806f3
Do not reset camera when pressing the update-map button 2023-07-09 15:25:38 +02:00
Lukas Rieger (Blue)
1f7f51c1e1
Add webapp option to default to flat-view 2023-07-04 14:42:12 +02:00
Lukas Rieger (Blue)
1b2dc45b4b
Add debug-log, improve logging in general and fix weblogger not closing correctly 2023-07-01 09:44:19 +02:00
Lukas Rieger (Blue)
15f5e8fd00
Fix default log file name 2023-06-29 13:51:41 +02:00
Lukas Rieger (Blue)
0ebea9982f
Apply Spotless fixes for BlueMapCommon 2023-06-29 13:42:56 +02:00
Lukas Rieger (Blue)
d570884def
Add advanced webserver logging + settings 2023-06-29 13:37:31 +02:00
Lukas Rieger (Blue)
8f97b08eb5
Use string-builder in verbose logger 2023-06-29 08:38:46 +02:00
Lukas Rieger (Blue)
4141d21a70
Add support for xff header in verbose web logger 2023-06-29 08:29:53 +02:00
Lukas Rieger (Blue)
0ac939a644
Always initialize PlayerSkinUpdater to be available to API 2023-06-22 08:21:36 +02:00
Lukas Rieger (Blue)
987015b617
Fix wrong config-key in plugin.conf template 2023-06-21 09:05:53 +02:00
Lukas Rieger (Blue)
fdd4713dfb
Fix command permission for deleting a map from a storage 2023-06-20 22:05:24 +02:00
Lukas Rieger (Blue)
b4b3e72d51
Make configs generate paths with forwardslashes whenever possible 2023-06-19 15:44:57 +02:00
Lukas Rieger (Blue)
31ae055ae5
Fix marker-set default-hide not working anymore 2023-06-19 11:47:53 +02:00
Lukas Rieger (Blue)
2f78f75a90
escape marker-set id when saving to local storage 2023-06-19 11:42:25 +02:00
Lukas Rieger (Blue)
76e3c4e758
Fix markers being selectable 2023-06-19 11:28:11 +02:00
Lukas Rieger (Blue)
49f76c1b11
Fix markers overlap over menu if more than 100 markers are on the map 2023-06-19 11:05:56 +02:00
Lukas Rieger (Blue)
b3c7d89793
revert accidentally committed vite config change 2023-06-18 23:52:41 +02:00
Lukas Rieger (Blue)
55095f1b5e
Add capabillity to use -follow players- in first-person mode. Closes: #175 2023-06-18 23:44:07 +02:00
Lukas Rieger (Blue)
cb638910ce
Remember hide/show status of marker-sets 2023-06-18 17:15:44 +02:00
Lukas Rieger (Blue)
85f4735050
Fix hours in AM/PM format instead of 24 2023-06-18 13:51:07 +02:00
Lukas Rieger (Blue)
2e572ddb11
Fix status command formatting and add last render times to status and maps commands 2023-06-18 13:46:41 +02:00
Lukas Rieger (Blue)
55fb955ed7
Fix clear() method not actually clearing the markerset. Fixes: #430 2023-06-17 13:33:42 +02:00
Lukas Rieger (Blue)
e46efc4c53
Use root-map element for scroll-events. Fixes: #409 2023-06-17 12:42:34 +02:00
Lukas Rieger (Blue)
22f2b09fe5
Fix Mobile first-person Controls not showing. Fixes: #447 2023-06-17 11:59:16 +02:00
Lukas Rieger (Blue)
4fc6d7f889
Fix stuck moving when window looses focus. Fixes: #408 2023-06-17 11:53:39 +02:00
Antti Ellilä
da8a12158b
Expose more JavaScript classes (#449) 
With the lack of a proper JavaScript API for addons, it might be useful to just expose all the classes in the global namespace for usage and code injection.
 2023-06-15 20:08:36 +02:00
stdpi
bac87ec546
chore: add Vietnamese translation (#448) 2023-06-15 19:12:22 +02:00
Lukas Rieger (Blue)
d120a00496
rename _index.php to mysql.php 2023-06-12 23:14:05 +02:00
MrSolarius
f149b823a7
Add support for postgres databases (#443) 
* Refactor : wrap every single SQL query inside an interface

* Feat : create every SQL request for postgres

* Refactor : rename SQLQueryAbstractFactory to SQLQueryFactory

* Feat : add dialect settings to blue map !

* Feat : Create two new storageClass for different storage approche

* Feat : add read BYTEA support

* Fix : remove unuseful println

* Fix : remove edited sql.conf

* Refactor / Feat : support for mysql

* Lots of tiny tweaks

---------

Co-authored-by: Lukas Rieger (Blue) <TBlueF@users.noreply.github.com>
 2023-06-12 22:55:44 +02:00
TechnicJelle
c807699c7c
Add port-in-use check (#440) 
* Add port-in-use check to plugin

* Add port-in-use check to CLI
 2023-06-08 23:12:20 +02:00
Lukas Rieger (Blue)
22917d36eb
Update vite for security-issue fix 
(We are not affected, but updating doesnt hurt)
 2023-06-07 14:18:46 +02:00
Lukas Rieger (Blue)
e2037e9698
Run status-command in separate thread 2023-05-15 17:40:47 +02:00
Lukas Rieger (Blue)
083c6c06c2
Improve progressEstimation function 2023-05-15 17:18:25 +02:00
Lukas Rieger (Blue)
742f96db6a
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2023-05-15 17:01:28 +02:00
Lukas Rieger (Blue)
f1f2336dff
Remove syncronization from estimateProgress() function 2023-05-15 17:01:10 +02:00
z-glitch
463f5cb120
Update URL for 3rd party addons and tools. (#431) 2023-05-14 11:55:35 +02:00
Lukas Rieger (Blue)
659fb99eb6
Avoid NPE if accessing the API while bluemap is unloaded 2023-05-14 02:18:31 +02:00
Lukas Rieger (Blue)
92e5300c1e
Clear chunks from cache when starting a render-task for them 2023-05-09 22:09:18 +02:00
Antti Ellilä
f467220400
Start rendering after everything else is loaded (#425) 
To attempt to fix the weirdness with tile filters not working at startup
 2023-05-07 19:24:43 +02:00
Lukas Rieger (Blue)
94dbd372dc
Fix typo 2023-05-01 20:43:16 +02:00
Lukas Rieger (Blue)
004f296b5e
Add storages command 2023-05-01 20:41:30 +02:00
MidnightTale
bc9e688317
Thai translation (#412) 
* Update settings.conf

* Create th.conf

* Update th.conf
 2023-04-14 09:41:24 +02:00
Sofiane H. Djerbi
bd4944fb2f
Fix typo in FR translation (#411) 2023-04-13 23:55:26 +02:00
Sofiane H. Djerbi
2c6f19aac1
Complete FR translation (#410) 2023-04-13 14:17:27 +02:00
Lukas Rieger (Blue)
2554462bb4
Remove falsely added import 2023-03-27 15:27:40 +02:00
Lukas Rieger (Blue)
3853055cf8
Fix camera issues with worlds that have their general height below 0 2023-03-27 14:52:11 +02:00
Lukas Rieger (Blue)
be705dad58
Tidy up latest change a little and add a comment 2023-03-26 12:13:47 +02:00
Lukas Rieger (Blue)
1d202bbd89
Fix click-raytracing in combination with scene-shifting 2023-03-26 12:05:04 +02:00
Antti Ellilä
00a3d4509c
Fix some page titles in translations (#399) 
* Fix title in zh_HK

* Fix title in sv

* Fix title in no_nb
 2023-03-17 13:21:41 +01:00
Lukas Rieger (Blue)
5e17df6b2a
Fix locking on the same lock that is used for loading causes the server to freeze 2023-03-13 19:30:31 +01:00
Lukas Rieger (Blue)
86b7e752ee
Improve default sql.conf (Jelle edition) 2023-03-11 11:47:08 +01:00
Lukas Rieger (Blue)
4181732db7
Improve default sql.conf 2 2023-03-11 11:45:27 +01:00
Lukas Rieger (Blue)
dbbcbb94c3
Improve default sql.conf 2023-03-11 11:43:46 +01:00
Lukas Rieger (Blue)
1be7dd5746
Implement abillity to handle Http-Requests asyncrounously 2023-03-06 20:38:38 +01:00
Lukas Rieger (Blue)
f3f609c573
Generalize purge task for all storages 2023-03-04 12:40:12 +01:00
Lukas Rieger (Blue)
c2499df3a7
Change image response to 204 and always save an empty players.json 2023-03-02 16:30:28 +01:00
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