 Namikon
|
7ca87b36cd
|
SignJar
|
2018-05-03 23:31:00 +02:00 |
|
|
Martin Robertz
|
ee5164c3b3
|
Merge pull request #14 from mitchej123/gregtech_ore_integration
Gregtech ore integration
1.0.2l
|
2017-12-11 01:02:24 +01:00 |
|
|
Jason Mitchell
|
59a478d14c
|
add gregtech api
|
2017-12-10 15:24:09 -08:00 |
|
|
Jason Mitchell
|
21981128ac
|
Don't block gregtech ores on AOE safe mode
|
2017-12-10 15:21:57 -08:00 |
|
|
Dream-Master
|
e65bfc1ea6
|
bump version
1.0.2k
|
2017-01-02 13:59:11 +01:00 |
|
|
Dream-Master
|
52f6b868ba
|
Revert "stuff..."
This reverts commit 9c2c528df1.
|
2017-01-02 13:58:39 +01:00 |
|
|
Martin Robertz
|
162d9c46d6
|
Update build.properties
|
2016-11-10 12:34:14 +01:00 |
|
|
Martin Robertz
|
c867c3a3a1
|
Merge pull request #13 from Ugachaga/master
Fix crash with Battlegear2
|
2016-11-10 12:33:28 +01:00 |
|
|
Ugachaga
|
6ed7fc5cc6
|
Prevent client crash,
Mine & Blade Battlegear 2 compatibility
|
2016-11-10 09:32:15 +07:00 |
|
|
Dream-Master
|
759018100c
|
bump version
|
2016-10-16 18:33:21 +02:00 |
|
|
Martin Robertz
|
f0d845ee3f
|
Merge pull request #12 from brandon3055/1.7.10
1.7.10
|
2016-10-16 17:31:37 +02:00 |
|
|
brandon3055
|
1032180d60
|
refactoring
|
2016-10-14 01:19:41 +11:00 |
|
|
brandon3055
|
614e5541d5
|
This is getting anoying
|
2016-10-14 01:18:54 +11:00 |
|
|
brandon3055
|
9c2c528df1
|
stuff...
|
2016-10-14 01:16:10 +11:00 |
|
|
Dream-Master
|
06eca83f44
|
add all libs
|
2016-09-03 01:23:53 +02:00 |
|
|
Dream-Master
|
57c5b560e8
|
Core Mod
|
2016-09-03 01:18:23 +02:00 |
|
|
Martin
|
5917addb7e
|
Merge pull request #11 from brandon3055/master
1.0.2.h
|
2016-07-05 18:15:25 +02:00 |
|
|
brandon
|
d73596cb82
|
1.0.2h
|
2016-07-05 22:15:26 +10:00 |
|
|
Martin
|
bc9f1093c2
|
Merge pull request #9 from OneEyeMaker/ArmorImprovements
Removed unnecessary code.
|
2016-06-29 19:04:41 +02:00 |
|
|
OneEyeMaker
|
9e210c2602
|
Removed unnecessary code.
|
2016-06-27 11:13:03 +03:00 |
|
|
Martin
|
1f0d2aafe8
|
Merge pull request #8 from OneEyeMaker/ArmorImprovements
Attempt to fix #345
|
2016-06-25 11:00:16 +02:00 |
|
|
OneEyeMaker
|
24b3af116c
|
Attempt to fix #345
|
2016-06-25 09:11:57 +03:00 |
|
|
Martin
|
0cccbb6aeb
|
Merge pull request #7 from brandon3055/master
1.0.2g
1.0.2g
|
2016-06-21 18:04:34 +02:00 |
|
|
brandon
|
b8372ac245
|
1.0.2g
|
2016-06-21 22:18:09 +10:00 |
|
|
Martin
|
efd6d87487
|
Merge pull request #6 from brandon3055/master
fixed server crash
|
2016-06-19 09:52:49 +02:00 |
|
|
brandon
|
db15be975d
|
fixed server crash
|
2016-06-19 00:24:17 +10:00 |
|
|
Martin
|
34898f9e17
|
Merge pull request #5 from OneEyeMaker/Configuration-1.7.10
Configuration 1.7.10
|
2016-06-17 19:03:54 +02:00 |
|
|
OneEyeMaker
|
1fe0132557
|
Added config options for wireless energy devices.
|
2016-06-17 20:01:39 +03:00 |
|
|
OneEyeMaker
|
a06801ec98
|
Fixed typo
|
2016-06-17 10:01:49 +03:00 |
|
|
Martin
|
c83c64a5b3
|
Merge pull request #4 from OneEyeMaker/ArmorImprovements
Now Draconic Armor protects from bees' stings.
|
2016-06-15 09:26:53 +02:00 |
|
|
OneEyeMaker
|
b9cc4b780f
|
Now Draconic Armor protects from bees' stings.
|
2016-06-15 10:13:28 +03:00 |
|
|
Martin
|
719fc04833
|
Merge pull request #3 from OneEyeMaker/Configuration-1.7.10
Added config options to change outer block of Energy Core.
|
2016-06-15 08:02:14 +02:00 |
|
|
OneEyeMaker
|
69c360cc93
|
Added config options to change outer block of Energy Core.
|
2016-06-15 07:18:12 +03:00 |
|
|
Martin
|
fc548382b8
|
Merge pull request #2 from brandon3055/master
1.0.2f
|
2016-06-13 18:05:14 +02:00 |
|
|
brandon
|
d20b90a147
|
1.0.2f
|
2016-06-13 15:44:58 +10:00 |
|
|
brandon
|
8395a5c991
|
Reformatted ALL THE THINGS!
|
2016-06-13 14:18:00 +10:00 |
|
|
brandon3055
|
23cce182de
|
Merge pull request #336 from OneEyeMaker/ConfigurationFix
Configuration fix
|
2016-06-13 14:15:03 +10:00 |
|
|
Martin
|
6a6b6b2cb7
|
Merge pull request #1 from OneEyeMaker/ConfigurationFix
Configuration fix
|
2016-06-12 19:52:33 +02:00 |
|
|
OneEyeMaker
|
d440a0b698
|
Fixes #335
Allows large capacity for armor.
|
2016-06-12 19:54:25 +03:00 |
|
|
OneEyeMaker
|
39b70b88de
|
Merge pull request #2 from brandon3055/master
Update changes.
|
2016-06-12 18:49:59 +03:00 |
|
|
brandon3055
|
9ad71e340b
|
Merge pull request #332 from OneEyeMaker/Configuration
Add more config options.
|
2016-06-12 19:07:56 +10:00 |
|
|
Dream-Master
|
64defd69ca
|
Merge branch 'Configuration'
|
2016-06-12 10:59:52 +02:00 |
|
|
OneEyeMaker
|
1f1f417906
|
Replaced tab character with spaces.
|
2016-06-12 08:42:56 +03:00 |
|
|
OneEyeMaker
|
4839f225d9
|
Fixed merge conflicts.
|
2016-06-12 08:39:35 +03:00 |
|
|
OneEyeMaker
|
a7b35c4f9b
|
Merge branch 'master' into Configuration
|
2016-06-12 08:27:14 +03:00 |
|
|
OneEyeMaker
|
6707fc9511
|
Merge pull request #1 from brandon3055/master
Getting ready to merge the config overhall pull request
|
2016-06-12 08:06:57 +03:00 |
|
|
brandon
|
a3e89cb900
|
Getting ready to merge the config overhall pull request
|
2016-06-12 03:33:57 +10:00 |
|
|
OneEyeMaker
|
ce3d3a8a23
|
Refactored code related with upgrades.
Now amount of RFCapacity upgrades isn't hard limited.
Now configs for Wyvern and Draconic Flux Capacitors are separated.
Simplified part of code.
|
2016-06-10 18:41:24 +03:00 |
|
|
OneEyeMaker
|
450c7e3d85
|
Added config options for count of upgrades for armor
|
2016-06-09 13:54:01 +03:00 |
|
|
OneEyeMaker
|
64fcc1f2ad
|
Added config options for count of upgrades for Draconic Staff
|
2016-06-09 10:42:28 +03:00 |
|