greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge the master branch into Greg's branch #258

Merged
greg6775 merged 16 commits from master into greg-dev 2019-12-26 22:45:26 +01:00
Conversation 0 Commits 16 Files changed 6 +2 -2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6fe655f830 - Show all commits

2
pom.xml
View file

@ -19,7 +19,7 @@
<dependency> <dependency>
<groupId>net.dv8tion</groupId> <groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId> <artifactId>JDA</artifactId>
<version>4.1.0_84</version> <version>4.1.0_86</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.json</groupId> <groupId>org.json</groupId>

2
src/main/java/com/bbn/hadder/Rethink.java
View file

@ -208,7 +208,7 @@ public class Rethink {
} }
public void setLanguage(String user_id, String language) { public void setLanguage(String user_id, String language) {
this.update("users", user_id, "language", language); this.update("user", user_id, "language", language);
} }
public String getLanguage(String user_id) { public String getLanguage(String user_id) {