Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

0ebc8181

Commit 0ebc8181 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'fix' into 'pregmod-master'

fix various issues

See merge request !7443

parents ef258e32 e96359fc

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

devTools/dictionary_phrases.txt 8 additions, 1 deletion

devTools/dictionary_phrases.txt
devTools/javaSanityCheck/ignoredVariables 7 additions, 10 deletions

devTools/javaSanityCheck/ignoredVariables
src/Mods/SecExp/attackOptions.tw 1 addition, 1 deletion

src/Mods/SecExp/attackOptions.tw
src/arcologyBuilding/shops.js 0 additions, 1 deletion

src/arcologyBuilding/shops.js
src/events/intro/introSummary.tw 2 additions, 4 deletions

src/events/intro/introSummary.tw

with 18 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment