Commit graph

2027 commits

Author SHA1 Message Date
Pahimar
3c28db961c Work on "better" json serialization of data objects 2016-05-11 22:56:39 -04:00
Pahimar
3a29be6d9a Emagherd work on the 1.7.10 version! 2016-05-11 16:00:03 -04:00
Pahimar
f6102b21da Merge pull request #916 from TheWhiteWolves/TheWhiteWolves-patch-1
Add default path to the switch statement.
2016-05-01 20:12:32 -04:00
Pahimar
25d7a2d584 Bump Forge version 2016-01-03 21:28:43 -05:00
Pahimar
3dd11bbf7c Bit more work on gui framework 2015-12-23 12:06:26 -05:00
Pahimar
b5c246e65a Bit more work on gui framework 2015-12-22 15:52:20 -05:00
Pahimar
6495a087a2 Bit more work on gui framework 2015-12-21 15:54:07 -05:00
Pahimar
bd09bc96c4 More work on my own generalized gui framework 2015-12-18 15:55:19 -05:00
Pahimar
9d410a52df Some very early work on my own Gui framework 2015-12-17 16:09:24 -05:00
Pahimar
cfe08dffae Hey working on a super cool new Admin Panel to make it way easier to set EE3 related values/settings on items. Woo! 2015-11-27 23:07:45 -05:00
Pahimar
1fbc290025 Deprecating Verdant and Azure Dust
Renaming "Tome of Alchemical Knowledge" to "Alchenomicon"
2015-11-25 16:00:37 -05:00
Pahimar
15fb3da1de Merge pull request #1019 from superreg/master
Change Arch Linux gradle installation method.
2015-11-25 09:10:23 -05:00
Reggie McLean
d1a9038a0c Change Arch Linux gradle installation method.
AUR link was broken.
2015-11-19 22:24:33 +00:00
Pahimar
35841c20ae Lots more Marker usage, for much better logging options (making my dev life so so so much easier) 2015-11-19 15:24:40 -05:00
Pahimar
d848ffe9ad New Loot Ball texture, care of @BigBadChris 2015-11-19 15:23:36 -05:00
Pahimar
9a710513f1 Fleshing out the LogHelper more so that we can utilize Log4j2 Markers in EE3 logging 2015-11-19 12:14:55 -05:00
Pahimar
fb262ec9c9 Newline to test new Jenkins server getting pushes from GitHub 2015-11-16 15:54:08 -05:00
Pahimar
94ab6bd638 Finally time for this old version check file to die (sorry people using really really old versions of EE3!) 2015-11-16 15:47:06 -05:00
Pahimar
fcd3f8c47b Update Forge, switch to proper semver, and update credits file for all my lovely (and very patient) patrons 2015-11-16 15:45:23 -05:00
Pahimar
873e98d74d Merge pull request #971 from Dragon9815/master
Fixed Lighting bug
2015-10-04 10:55:17 -05:00
Pahimar
b8ef89c72d Merge pull request #987 from 50Wliu/master
Update README.md and add CONTRIBUTING.md
2015-08-21 13:34:22 -05:00
Wliu
77ae3bad32 revert --> reset 2015-08-20 03:33:03 -04:00
Wliu
9ccbb7dc37 Update README.md and add CONTRIBUTING.md
Closes #985
2015-08-20 03:02:50 -04:00
SteGr
3e6c80af77 Fixed Lightning bug 2015-08-06 15:09:34 +02:00
Lizbeth Rika
cb5a5d43c4 Revert "Move out, taking over."
This reverts commit 711d5282fe.
2015-07-27 17:59:26 +01:00
Lizbeth Rika
711d5282fe Move out, taking over. 2015-07-27 17:46:42 +01:00
Pahimar
71ca3c922c Merge pull request #927 from Virtuoel/Virtuoel-patch-3
Fix for dupe bug #825
2015-07-04 18:19:13 -02:30
Virtuoel
e9195afcde Fixes #825 2015-06-29 03:26:12 +03:00
TheWhiteWolves
f35b62b4df Add default path to the switch statement.
Added in a default case to the switch statement to deal with the UP, DOWN and UNKNOWN forge directions and solve the java warnings about them.
2015-06-15 19:40:08 +01:00
Virtuoel
783fa978c2 Merge pull request #2 from pahimar/master
Update master
2015-06-12 19:54:02 +03:00
pahimar
b59fe4f64b Didn't even think to deprecated Enum entries - doh 2015-06-10 07:47:22 -04:00
pahimar
a196413c20 Remove unused inner class 2015-06-10 07:43:13 -04:00
Pahimar
e4c6183083 A lot of various things done, including fixing derpy bounding boxes/etc 2015-06-09 23:25:40 -04:00
Pahimar
a3c5c3fafd Change default configuration setting for when to regenerate EMC values from 'When Mods Change' to 'Always; 2015-06-09 21:27:45 -04:00
Pahimar
db1416b6d5 Fixes #889 2015-06-03 21:41:14 -04:00
Pahimar
e6faf84072 Fixes #902 2015-06-03 21:13:50 -04:00
Pahimar
30f1a05872 Merge pull request #904 from Virtuoel/Virtuoel-patch-2
Fix for dupe bugs #835 and #866
2015-06-03 21:01:59 -04:00
Virtuoel
13c9f8d8c2 Fix Transmutation Tablet inventory name 2015-06-03 16:49:36 +03:00
Virtuoel
7d799a41c8 Fix dupe bug #866
Number keys no longer move items around.
2015-06-03 16:47:42 +03:00
Virtuoel
e664a7dfad Fix dupe bug #835
Alchemical bag that is held can no longer be moved. Number keys no
longer move items around.
2015-06-03 16:45:45 +03:00
Virtuoel
3f5c108b81 Merge pull request #1 from pahimar/master
Update
2015-06-02 15:46:12 +03:00
Pahimar
a6b06b50ae Fixes #896 2015-05-29 21:56:13 -04:00
Pahimar
502d9d59cd Increase the max size of arrays to 9x9, and increased the durability to 81 2015-05-29 21:44:20 -04:00
Pahimar
c3420345ad Forgot to set AlchemyArrayTransmutation as a child class of AlchemyArrayEE 2015-05-29 21:07:59 -04:00
Pahimar
650cb1410a Adding in 8 new alchemy arrays (WIP, textures for now). New Transmutation Alchemy Array texture too! 2015-05-29 21:03:15 -04:00
Pahimar
f4cc4fb108 Add debug config option to log all TRACE level events to INFO (if you ONLY want to see EE3 related TRACE stuff developers, enable this) 2015-05-29 19:47:51 -04:00
pahimar
a48196b580 Switch away from NBT for WrappedStack and setting values 2015-05-28 10:56:49 -04:00
Pahimar
1d617e53b5 Fix broken import in #893 2015-05-27 21:54:50 -04:00
Pahimar
f0cafcc763 Merge pull request #893 from CatDany/patch-2
Tome rendering on Fast looks weird. Fixes #892
2015-05-27 21:54:19 -04:00
Pahimar
38e9f313c5 Fix GUIs not closing when the TileEntity is removed/destroyed 2015-05-27 21:37:55 -04:00