Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
TS committed Jul 10, 2021
2 parents 098c85a + 342d916 commit d7ce9f2
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 26 deletions.
2 changes: 1 addition & 1 deletion dist/tgen-with-presets.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

var SeamlessTextureGenerator = (function () {
return {
version: "1.3.6",
version: "1.3.7",
defaults: {},
effects: {},
filters: [],
Expand Down
4 changes: 2 additions & 2 deletions dist/tgen-with-presets.min.js

Large diffs are not rendered by default.

Binary file modified dist/tgen-with-presets.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/tgen.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

var SeamlessTextureGenerator = (function () {
return {
version: "1.3.6",
version: "1.3.7",
defaults: {},
effects: {},
filters: [],
Expand Down
4 changes: 2 additions & 2 deletions dist/tgen.min.js

Large diffs are not rendered by default.

Binary file modified dist/tgen.min.js.gz
Binary file not shown.
66 changes: 49 additions & 17 deletions package-lock.json

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

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "seamless-texture-generator",
"version": "1.3.6",
"version": "1.3.7",
"description": "Seamless texture generator",
"homepage": "https://github.com/schalkt/tgen/",
"scripts": {
Expand Down Expand Up @@ -39,6 +39,7 @@
"gulp-uglify": "3.0.2",
"jshint": "2.13.0",
"mocha": "9.0.2",
"pngjs": "6.0.0"
"pngjs": "6.0.0",
"glob-parent": ">=5.1.2"
}
}
2 changes: 1 addition & 1 deletion src/tgen-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

var SeamlessTextureGenerator = (function () {
return {
version: "1.3.6",
version: "1.3.7",
defaults: {},
effects: {},
filters: [],
Expand Down

0 comments on commit d7ce9f2

Please sign in to comment.