Merge remote-tracking branch 'origin/develop'

# Conflicts: # demo/index.html # dist/tgen-with-presets.min.js # dist/tgen-with-presets.min.js.LICENSE.txt # dist/tgen-with-presets.min.js.gz # dist/tgen.min.js # dist/tgen.min.js.LICENSE.txt # dist/tgen.min.js.gz # package-lock.json # package.json # src/tgen-base-common.js # src/tgen-base-with-presets.js # src/tgen-base.js
schalkt · Sep 19, 2023 · 7caad16 · 7caad16
2 parents bcdcb1a + dba5153
commit 7caad16
Show file tree

Hide file tree

Showing 13 changed files with 1,416 additions and 1,113 deletions.
diff --git a/demo/.gitignore b/demo/.gitignore
@@ -0,0 +1 @@
+index.php
diff --git a/demo/index.html b/demo/index.html
@@ -9,7 +9,7 @@
     />
     <meta name="author" content="Tamas Schalk" />
     <meta name="robots" content="index, follow" />
-    <link type="text/css" rel="stylesheet" media="all" href="/generator/demo/css/index.css" />
+    <link type="text/css" rel="stylesheet" media="all" href="css/index.css" />
     <meta
       property="og:title"
       content="tgen.js | The seamless texture generator"
@@ -167,8 +167,8 @@ <h1>Seamless texture generator</h1>
       referrerpolicy="no-referrer"
     ></script>
 
-    <script src="/generator/dist/tgen-with-presets.min.js"></script>
-    <script src="/generator/demo/js/index.js"></script>
+    <script src="./../dist/tgen-with-presets.min.js"></script>
+    <script src="js/index.js"></script>
     <script async src="https://schalk.storeking.hu/assets/js/stat.min.js" id="schtat" server="https://schalk.storeking.hu" delay="1400" key="iH86fnFbyJpprnegz9IB2jc8LOh37Sky4g2MDLxG5GrmCrBKfktqxXQid49uzSG6HYha3EvZ"></script>
 
     <script>

diff --git a/dist/tgen-with-presets.min.js b/dist/tgen-with-presets.min.js
diff --git a/dist/tgen-with-presets.min.js.LICENSE.txt b/dist/tgen-with-presets.min.js.LICENSE.txt
@@ -5,7 +5,7 @@
  * https://texture-generator.com/
  *
  * @copyright 2015-2022 Tamas Schalk
- * @version 1.4.18
+ * @version 1.4.20
  * @license MIT
  *
  */
diff --git a/dist/tgen-with-presets.min.js.gz b/dist/tgen-with-presets.min.js.gz
diff --git a/dist/tgen.min.js b/dist/tgen.min.js
diff --git a/dist/tgen.min.js.LICENSE.txt b/dist/tgen.min.js.LICENSE.txt
@@ -5,7 +5,7 @@
  * https://texture-generator.com/
  *
  * @copyright 2015-2022 Tamas Schalk
- * @version 1.4.18
+ * @version 1.4.20
  * @license MIT
  *
  */
diff --git a/dist/tgen.min.js.gz b/dist/tgen.min.js.gz
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "seamless-texture-generator",
-  "version": "1.4.18",
+  "version": "1.4.20",
   "description": "Seamless texture generator",
   "homepage": "https://github.com/schalkt/tgen/",
   "scripts": {
@@ -34,7 +34,7 @@
   "devDependencies": {
     "compression-webpack-plugin": "^10.0.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.44.0",
+    "eslint": "^8.49.0",
     "i": "^0.3.7",
     "laravel-mix": "^6.0.49",
     "lodash": "^4.17.21",

diff --git a/src/tgen-base-common.js b/src/tgen-base-common.js
@@ -5,13 +5,13 @@
  * https://texture-generator.com/
  *
  * @copyright 2015-2022 Tamas Schalk
- * @version 1.4.18
+ * @version 1.4.20
  * @license MIT
  *
  */
 
 const SeamlessTextureGenerator = {
-  version : "1.4.18",
+  version : "1.4.20",
   defaults: {},
   effects: {},
   prepare: {},

diff --git a/src/tgen-base-with-presets.js b/src/tgen-base-with-presets.js
@@ -5,7 +5,7 @@
  * https://texture-generator.com/
  *
  * @copyright 2015-2022 Tamas Schalk
- * @version 1.4.18
+ * @version 1.4.20
  * @license MIT
  *
  */

diff --git a/src/tgen-base.js b/src/tgen-base.js
@@ -5,7 +5,7 @@
  * https://texture-generator.com/
  *
  * @copyright 2015-2022 Tamas Schalk
- * @version 1.4.18
+ * @version 1.4.20
  * @license MIT
  *
  */