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 Mar 29, 2020
2 parents 358e323 + c8d7a4c commit 4fcb74a
Show file tree
Hide file tree
Showing 6 changed files with 273 additions and 75 deletions.
2 changes: 1 addition & 1 deletion dist/tgen.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var SeamlessTextureGenerator = (function() {

return {

version: '1.1.30',
version: '1.1.31',
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.
4 changes: 2 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.1.30",
"version": "1.1.31",
"description": "Seamless texture generator",
"homepage": "https://github.com/schalkt/tgen/",
"scripts": {
Expand Down Expand Up @@ -35,7 +35,7 @@
"gulp-replace": "1.0.0",
"gulp-uglify": "3.0.2",
"jshint": "^2.11.0",
"mocha": "^7.1.0",
"mocha": "^7.1.1",
"pngjs": "^3.4.0"
}
}
2 changes: 1 addition & 1 deletion src/tgen-base.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var SeamlessTextureGenerator = (function() {

return {

version: '1.1.30',
version: '1.1.31',
defaults: {},
effects: {},
filters: [],
Expand Down
Loading

0 comments on commit 4fcb74a

Please sign in to comment.