Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-06-26 14:35:04 +02:00
Code Issues Projects Releases Wiki Activity
1,067 Commits 5 Branches 101 Tags 15 MiB
3a1e723a51
Commit Graph

1067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lukas Rieger (Blue)
310a2e55eb
Fix NullPointerException when trying to load textures from an empty textures.json file 2023-02-10 17:02:15 +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
Lukas Rieger (Blue)
7d263c8b7f
Use the original value in the error 2023-02-07 11:09:08 +01:00
Lukas Rieger (Blue)
8b16805515
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2023-02-07 11:04:01 +01:00
Lukas Rieger (Blue)
cc99021ca8
Add invalid value to color-format exception 2023-02-07 11:03:54 +01:00
KaRiLaA
3aa4b4a995
Update UA and RU translation (#389) 2023-02-06 09:27:50 +01:00
Lukas Rieger (Blue)
ec2d316b63
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2023-02-01 21:43:00 +01:00
Lukas Rieger (Blue)
12b75f64a1
Dont load the full meta-file only to test if it exists 2023-02-01 21:42:43 +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)
d9b6c526f8
load all model folders except item 2023-01-14 00:15:30 +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)
4cc3774590
Remove forge versions pre 1.16.5 since they dont work with Java 11. Fixes: #379 2023-01-06 01:30:10 +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)
5a75b330f5
Push BlueMapAPI 2023-01-03 15:02:35 +01:00
Lukas Rieger (Blue)
b80088671b
Fix error on sponge servers trying to update players 2023-01-01 12:54:37 +01:00
Lukas Rieger (Blue)
e659eb63aa
Wrong table name >_> 2023-01-01 12:42:25 +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)
493f0c9bec
Add script to update databases correctly for the new version format 2023-01-01 12:20:55 +01:00
Lukas Rieger (Blue)
b60984221c
Add --host parameter to vite dev-server 2023-01-01 12:19:47 +01:00
Lukas Rieger (Blue)
cd385b4ba3
No more automatic publishing, as github actions is not competent enough 2022-12-31 12:29:30 +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
Lukas Rieger (Blue)
fa60887c8d
Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap 2022-12-29 16:07:14 +01:00
Lukas Rieger (Blue)
045f8e718a
Fix wrong meta-file-path 2022-12-29 16:06:53 +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