github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://git.magefree.com/var/lib/git/mage.git

Browse source
This commit is contained in:
North 2012-01-30 22:06:48 +02:00
commit d863e957fc
5 changed files with 9 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/mage/client/dialog/FeedbackDialog.java
View file

@ -249,7 +249,10 @@ public class FeedbackDialog extends javax.swing.JDialog {
if (message.length() > 300) { if (message.length() > 300) {
JOptionPane.showMessageDialog(null, "\"Describe your idea\" value is too long (300 characters max)", "Warning", JOptionPane.INFORMATION_MESSAGE); JOptionPane.showMessageDialog(null, "\"Describe your idea\" value is too long (300 characters max)", "Warning", JOptionPane.INFORMATION_MESSAGE);
} }
String email = cleanUpType(cbFeedbackType.getSelectedItem().toString()); String email = txtEmail.getText().trim();
if (email.length() > 100) {
email = email.substring(0, 100);
}
if (MageFrame.getSession().sendFeedback(title, type, message, email)) { if (MageFrame.getSession().sendFeedback(title, type, message, email)) {
JOptionPane.showMessageDialog(null, "Feedback was sent. Thank you!", "Success", JOptionPane.INFORMATION_MESSAGE); JOptionPane.showMessageDialog(null, "Feedback was sent. Thank you!", "Success", JOptionPane.INFORMATION_MESSAGE);
reset(); reset();

2
Mage.Server.Console/src/main/java/mage/server/console/ConnectDialog.java
View file

@ -483,7 +483,7 @@ public class ConnectDialog extends JDialog {
private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
BufferedReader in = null; BufferedReader in = null;
try { try {
URL serverListURL = new URL("http://mage.googlecode.com/files/server-list.txt"); URL serverListURL = new URL("http://download.magefree.com/files/server-list.txt");
in = new BufferedReader(new InputStreamReader(serverListURL.openStream())); in = new BufferedReader(new InputStreamReader(serverListURL.openStream()));
List<String> servers = new ArrayList<String>(); List<String> servers = new ArrayList<String>();

6
Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml
View file

@ -10,9 +10,9 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" /> <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
<orderEntry type="module" module-name="Mage" /> <orderEntry type="module" module-name="mage" />
<orderEntry type="module" module-name="Mage-Player-AI" /> <orderEntry type="module" module-name="mage-player-ai" />
<orderEntry type="module" module-name="Mage-Sets" /> <orderEntry type="module" module-name="mage-sets" />
</component> </component>
</module> </module>

2
Mage.Server/src/main/java/mage/server/util/ServerMessagesUtil.java
View file

@ -97,10 +97,10 @@ public class ServerMessagesUtil {
log.debug("Reading server messages..."); log.debug("Reading server messages...");
List<String> motdMessages = readFromFile(); List<String> motdMessages = readFromFile();
List<String> newMessages = new ArrayList<String>(); List<String> newMessages = new ArrayList<String>();
newMessages.add(getServerStatistics());
if (motdMessages != null) { if (motdMessages != null) {
newMessages.addAll(motdMessages); newMessages.addAll(motdMessages);
} }
newMessages.add(getServerStatistics());
lock.writeLock().lock(); lock.writeLock().lock();
try { try {

58
Mage.Sets/src/mage/sets/urzassaga/Fluctuator.java
View file

@ -1,58 +0,0 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.urzassaga;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.keyword.CyclingAbility;
import mage.cards.CardImpl;
/**
*
* @author North
*/
public class Fluctuator extends CardImpl<Fluctuator> {
public Fluctuator(UUID ownerId) {
super(ownerId, 295, "Fluctuator", Rarity.RARE, new CardType[]{CardType.ARTIFACT}, "{2}");
this.expansionSetCode = "USG";
this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
}
public Fluctuator(final Fluctuator card) {
super(card);
}
@Override
public Fluctuator copy() {
return new Fluctuator(this);
}
}