Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Yemachu committed Jan 17, 2019
2 parents aff09ff + d3720f8 commit 025eae7
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 1 deletion.
80 changes: 80 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test

# parcel-bundler cache (https://parceljs.org/)
.cache

# next.js build output
.next

# nuxt.js build output
.nuxt

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h1>Neo New Card maker</h1>
</div>
</article>
<footer>

<a href="https://neocardmaker.com/forum/index.php">NCM Forum</a> |
<a href="https://forum.yugiohcardmaker.net/topic/372510-neo-new-card-maker-110/">YCM Forum</a>
</footer>
<script src="src/config.js"></script>
Expand Down
25 changes: 25 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"name": "cardmaker",
"version": "1.1.1",
"description": "Generate custom cards for trading card games.",
"main": "build/index.js",
"directories": {
"lib": "lib"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/yemachu/cardmaker.git"
},
"keywords": [
"tcg"
],
"author": "Yemachu",
"license": "MIT",
"bugs": {
"url": "https://github.com/yemachu/cardmaker/issues"
},
"homepage": "https://github.com/yemachu/cardmaker#readme"
}

0 comments on commit 025eae7

Please sign in to comment.