Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
TS committed Apr 30, 2022
2 parents 2d05abf + 4c46a51 commit 712368f
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 31 deletions.
2 changes: 1 addition & 1 deletion dist/tgen-with-presets.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/tgen-with-presets.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* https://texture-generator.com/
*
* @copyright 2015-2022 Tamas Schalk
* @version 1.4.4
* @version 1.4.5
* @license MIT
*
*/
Binary file modified dist/tgen-with-presets.min.js.gz
Binary file not shown.
68 changes: 44 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "seamless-texture-generator",
"version": "1.4.4",
"version": "1.4.5",
"description": "Seamless texture generator",
"homepage": "https://github.com/schalkt/tgen/",
"scripts": {
Expand Down Expand Up @@ -38,9 +38,9 @@
"lodash": "^4.17.21",
"mocha": "9.2.2",
"pngjs": "6.0.0",
"postcss": "^8.4.12",
"postcss": "^8.4.13",
"resolve-url-loader": "^5.0.0",
"sass": "^1.49.9",
"sass": "^1.51.0",
"sass-loader": "^12.6.0"
}
}
4 changes: 2 additions & 2 deletions src/tgen-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
* https://texture-generator.com/
*
* @copyright 2015-2022 Tamas Schalk
* @version 1.4.4
* @version 1.4.5
* @license MIT
*
*/

var SeamlessTextureGenerator = {
version : "1.4.4",
version : "1.4.5",
defaults: {},
effects: {},
prepare: {},
Expand Down
2 changes: 2 additions & 0 deletions webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ const mix = require("laravel-mix");
const package = JSON.parse(fs.readFileSync("./package.json"));
const CompressionPlugin = require("compression-webpack-plugin");

mix.disableNotifications();

mix.extend("replace", function (webpackConfig, ...args) {
args[0].forEach(function (item) {
let content = fs.readFileSync(item[0]).toString().replace(item[1], item[2]);
Expand Down

0 comments on commit 712368f

Please sign in to comment.