bitte verwendet nur noch addressen die https beginnen! Siehe wiki https://wiki.mediacube.at/wiki/index.php?title=Repositories#ssh-_vs._https_repository_adressen

alle von MMT haben hier Zugriff. Du willst Deine Freunde von MMA auch dabei haben? Mail mit den usernamen an Brigitte Jellinek

Commit bb43933f authored by Christoph Mayr's avatar Christoph Mayr

not a veryusefulcommit

parent 3623a024
......@@ -2,10 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="03703853-d797-498e-a74c-c726d51baed3" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/pokedex.iml" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.js" afterPath="$PROJECT_DIR$/index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pokemon.json" afterPath="$PROJECT_DIR$/pokemon.json" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
......@@ -20,11 +18,11 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
<caret line="53" column="34" lean-forward="false" selection-start-line="53" selection-start-column="34" selection-end-line="53" selection-end-column="34" />
<state relative-caret-position="330">
<caret line="22" column="44" lean-forward="true" selection-start-line="22" selection-start-column="44" selection-end-line="22" selection-end-column="44" />
<folding />
</state>
</provider>
......@@ -43,11 +41,9 @@
<file leaf-file-name="pokemon.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pokemon.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="173" column="5" lean-forward="false" selection-start-line="166" selection-start-column="4" selection-end-line="173" selection-end-column="5" />
<folding>
<marker date="1528808165905" expanded="true" signature="0:71927" ph="[...]" />
</folding>
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -55,14 +51,14 @@
<file leaf-file-name="minijson.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/minijson.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="3" lean-forward="false" selection-start-line="30" selection-start-column="3" selection-end-line="30" selection-end-column="3" />
<state relative-caret-position="465">
<caret line="31" column="1" lean-forward="false" selection-start-line="31" selection-start-column="1" selection-end-line="31" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
......@@ -91,10 +87,10 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/index.js" />
<option value="$PROJECT_DIR$/pokemon.json" />
<option value="$PROJECT_DIR$/minijson.json" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/minijson.json" />
<option value="$PROJECT_DIR$/pokemon.json" />
<option value="$PROJECT_DIR$/index.js" />
</list>
</option>
</component>
......@@ -175,12 +171,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1528804284204</updated>
<workItem from="1528804285428" duration="2316000" />
<workItem from="1528804285428" duration="3712000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2316000" />
<option name="totallyTimeSpent" value="3712000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="877" extended-state="0" />
......@@ -224,44 +220,42 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.js">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
<caret line="53" column="34" lean-forward="false" selection-start-line="53" selection-start-column="34" selection-end-line="53" selection-end-column="34" />
<state relative-caret-position="180">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pokemoncopy.json">
<entry file="file://$PROJECT_DIR$/minijson.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="5" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="9" selection-end-column="5" />
<state relative-caret-position="465">
<caret line="31" column="1" lean-forward="false" selection-start-line="31" selection-start-column="1" selection-end-line="31" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pokemon.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="173" column="5" lean-forward="false" selection-start-line="166" selection-start-column="4" selection-end-line="173" selection-end-column="5" />
<folding>
<marker date="1528808165905" expanded="true" signature="0:71927" ph="[...]" />
</folding>
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/minijson.json">
<entry file="file://$PROJECT_DIR$/pokemoncopy.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="3" lean-forward="false" selection-start-line="30" selection-start-column="3" selection-end-line="30" selection-end-column="3" />
<state relative-caret-position="135">
<caret line="9" column="5" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="9" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<entry file="file://$PROJECT_DIR$/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<state relative-caret-position="330">
<caret line="22" column="44" lean-forward="true" selection-start-line="22" selection-start-column="44" selection-end-line="22" selection-end-column="44" />
<folding />
</state>
</provider>
......
......@@ -24,7 +24,7 @@ rl.on('line', function(line) {
outJson["poke_txt_en"] = lineJson.Name
outJson["gen_txt_en"] = lineJson.Generation
outJson["about_txt_en"] = lineJson.About
outJson["types_features"] = lineJson.Types
outJson["types_features"] = linejson.Types
/*
// opening_text is optional
......@@ -37,6 +37,7 @@ rl.on('line', function(line) {
//accumulate JSON objects before they are sent
accumData(outJson)
}
})
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment