Commit graph

272 commits

Author SHA1 Message Date
Shadows_of_Fire
1e817c3fa9 Fixes #904 finally, probably for the last time
Also deduplicates multiple entries of say 1 iron ore to LITERALLY EVERY
IRON DUST because that was stupid and just clutter.
2017-08-24 01:00:33 -04:00
Shadows_of_Fire
22f9f4440e Closes #904 2017-08-22 20:01:54 -04:00
Ellpeck
77a808ab76 r118 2017-08-21 02:33:37 +02:00
Ellpeck
cc8124d941 r117 2017-07-28 22:48:50 +02:00
Brennan Ward
912539e81d Might burn down ur house (#868)
* Various generics/deprecation shit

this might all catch on fire, honestly, but it shouldn't, unless someone
was using the wrong I18n in the wrong place in the first place...

* uncrash the server

depending on where else big dad used the bad I18n this might also still
be crashy crash
2017-07-28 03:17:50 +02:00
Ellpeck
3042592da9 r116 2017-07-19 12:34:18 +02:00
Ellpeck
1fec7a0473 r115
suck my balls
2017-07-12 22:25:18 +02:00
Ellpeck
04541bd7a9 r114! 2017-07-08 21:13:25 +02:00
Brennan Ward
978d624eeb Closes #839 and #840 (#841)
* Safeguard against #840

* update Common caps

* Closes #839
2017-07-08 20:56:24 +02:00
Brennan Ward
0787f6eb6c Closes #828 and #829 (#835)
* update to gradle 4.0

* update forge/maps

* Fix table on a stick

now mimics vanilla behavior and tries to add stacks back to inv before
dropping.

* fix a nonsense dupe glitch

* fix worm

* move a thing so its not on fire

and lowercase thingy
2017-07-07 22:09:56 +02:00
Ellpeck
3b7a9fec87 r113 >_> 2017-06-29 21:04:44 +02:00
Ellpeck
c6499a19c3 r112 2017-06-29 18:43:57 +02:00
Brennan Ward
d9b6838df9 Fix everything (#825)
* Fix everything

* json
2017-06-29 18:30:02 +02:00
Ellpeck
a40abe88af this is completely broken but maybe someone will fix it soon 2017-06-29 13:00:11 +02:00
Ellpeck
38168423e7 r111 2017-06-17 00:57:46 +02:00
Ellpeck
fee478d960 I did a thing 2017-06-17 00:48:49 +02:00
Ellpeck
c28c6a04ec r110 2017-06-16 22:43:26 +02:00
Ellpeck
544c4020ee r109! 2017-05-28 14:15:11 +02:00
Ellpeck
8755382908 r108! 2017-05-20 21:10:31 +02:00
Ellpeck
62d074e758 updated forge 2017-05-20 21:05:25 +02:00
Ellpeck
b62c071179 r107 2017-05-03 14:56:46 +02:00
Ellpeck
9216debef4 r106! 2017-03-16 12:19:38 +01:00
Ellpeck
89a31452f5 Fixed cascading world gen with lush caves and plants
Closes #690
2017-03-16 11:53:30 +01:00
Ellpeck
d054517a94 r103! 2017-03-03 16:37:46 +01:00
Ellpeck
6cda361c54 r102 2017-02-15 06:44:47 +01:00
Ellpeck
3a9cacf292 r101! 2017-02-14 21:16:42 +01:00
Ellpeck
10439db8ca r100!? 2017-02-06 14:14:37 +01:00
Ellpeck
4615a94339 Implemented slotless item handler compat (untested!) 2017-02-04 14:12:17 +01:00
Ellpeck
01054855d9 r99! 2017-01-22 11:55:00 +01:00
Ellpeck
8b6c13d54f r96! 2016-12-29 22:37:55 +01:00
Ellpeck
f7522ccceb r95! 2016-12-27 21:49:33 +01:00
Ellpeck
1b2b033824 Updated to 1.11.2 2016-12-27 12:35:08 +01:00
Ellpeck
634b330f97 r92! 2016-12-18 17:47:36 +01:00
Ellpeck
0630601b9d r90 and 91! 2016-12-08 22:26:38 +01:00
Ellpeck
ee99b1fccc Make the Leaf Blower work with all shearable things
Closes #456
2016-12-06 13:40:51 +01:00
Ellpeck
9b7177fbe9 Update forge 2016-12-05 17:10:23 +01:00
Ellpeck
c377d54e52 r89! 2016-12-05 15:39:31 +01:00
Ellpeck
c1c587904a r86! 2016-12-02 21:12:07 +01:00
Ellpeck
442d0f6a4e r83! 2016-11-27 19:07:11 +01:00
Ellpeck
bef2e00b17 r82! 2016-11-27 13:14:57 +01:00
Ellpeck
adad967c02 Finally updated all the mappings 2016-11-26 21:32:28 +01:00
Ellpeck
a24f389bb3 r80! ..hang on.. what? 2016-11-23 18:52:30 +01:00
Ellpeck
75dd39ad80 r78! 2016-11-22 19:59:22 +01:00
Ellpeck
9708a9a767 Added engineer and crystallizer villager 2016-11-21 17:50:33 +01:00
Ellpeck
f116c68f9c r77! 2016-11-20 20:31:38 +01:00
Ellpeck
63f14080df r76 - 1.11! 2016-11-20 04:14:44 +01:00
Ellpeck
ec8c642099 1.11, first step. 2016-11-19 21:11:17 +01:00
Ellpeck
8f92cc5170 r75.
I'm so sorry. :v
2016-11-18 23:22:54 +01:00
Ellpeck
581c9819e4 r74! 2016-11-18 06:42:02 +01:00
Ellpeck
848e7f57a4 r73! 2016-11-17 20:30:18 +01:00
Ellpeck
90495a9ea5 r72! 2016-11-17 18:16:14 +01:00
Ellpeck
b667b1a257 r71! 2016-11-12 17:08:54 +01:00
Ellpeck
57f16ec321 Update JEI 2016-11-08 23:35:11 +01:00
Ellpeck
a76000d635 r70! 2016-11-05 16:28:10 +01:00
Ellpeck
584f6bc034 Filling thing, part 1 2016-11-05 15:36:16 +01:00
Ellpeck
7989b7953d r69! 2016-10-31 22:40:16 +01:00
Ellpeck
78cd39e043 r68! 2016-10-30 23:43:39 +01:00
Ellpeck
acebcb2fbd Changed the way crusher recipes are registered
Closes #297
2016-10-30 17:13:46 +01:00
Ellpeck
51e8d36ca5 Update forge and jei 2016-10-29 10:47:33 +02:00
Ellpeck
b1b36ee0b4 r67! 2016-10-19 19:01:54 +02:00
Ellpeck
4c855914e6 r66! 2016-10-11 14:45:41 +02:00
Ellpeck
b3285948c7 r65! 2016-10-04 23:33:43 +02:00
Ellpeck
ad9d22255f r64! 2016-10-02 02:49:53 +02:00
Ellpeck
3b9afdc568 r63! 2016-09-17 12:31:09 +02:00
Ellpeck
ca9442e081 r62.
I'm sorry. °~°
2016-09-01 20:54:45 +02:00
Ellpeck
39baccc762 Added Fluid Laser Relays 2016-09-01 20:50:44 +02:00
Ellpeck
a2000d8bb3 r61! 2016-08-31 21:23:47 +02:00
Ellpeck
ba4f4252e0 r60! 2016-08-13 22:40:37 +02:00
Ellpeck
79f18910f2 r59! 2016-08-12 22:12:40 +02:00
Ellpeck
b0eb83f45f r58!~ 2016-08-07 12:48:56 +02:00
Ellpeck
f330657cf7 r57! 2016-08-03 20:02:11 +02:00
Ellpeck
969b013d6d Updated dependencies.
Turns out: Nothing changed.
2016-08-02 12:44:58 +02:00
XDjackieXD
bdecc3a1bd Jenkins & Maven preparations 2016-07-31 16:30:37 +02:00
Ellpeck
3511af0f90 r56! 2016-07-26 15:07:39 +02:00
Ellpeck
12d1fe26cc r55! 2016-07-23 19:32:53 +02:00
Ellpeck
42c04fec90 r54.
I hate my life.
2016-07-22 00:20:07 +02:00
Ellpeck
ecfdb9a555 Pretend this never happened please 2016-07-21 22:18:23 +02:00
Ellpeck
3e85e7f94c sorry NEI 2016-07-21 20:43:06 +02:00
Ellpeck
d56ff8ccb0 r52! 2016-07-21 20:40:32 +02:00
Ellpeck
24075e70e9 Updated all of the things.
Which was totally pointless, because nothing changed.
2016-07-21 19:26:24 +02:00
Ellpeck
60266c0505 r51~ 2016-07-17 14:16:08 +02:00
Ellpeck
58e24ad9f1 r50! 2016-07-11 17:41:35 +02:00
Ellpeck
a4de418b38 r49! 2016-07-07 06:59:05 +02:00
Ellpeck
8d8519786e r48! 2016-07-06 22:01:28 +02:00
Ellpeck
b55c63538f 1.10.2 and with that, r47! 2016-06-29 14:03:14 +02:00
Ellpeck
26a7d74247 Updated forge, fixed some storage crate related stuff 2016-06-27 20:49:26 +02:00
Ellpeck
7274eb5599 r46! 2016-06-23 19:33:23 +02:00
Ellpeck
c297df9cc4 Made fluid collector not output and input wrong stuff 2016-06-23 19:27:42 +02:00
Ellpeck
9b575c5725 r45! 2016-06-19 12:59:31 +02:00
Ellpeck
cba94da5c5 Removed rarmor integration as the mod is being rewritten soon.
Sorry. :v
2016-06-17 14:54:53 +02:00
Ellpeck
138a1af26c Added Tesla support.
Closes #124
2016-06-17 14:00:52 +02:00
Ellpeck
e0e9450e36 r44 >_> 2016-06-12 01:35:59 +02:00
Ellpeck
4144f03d14 r43! 2016-06-11 17:28:25 +02:00
Ellpeck
26d5d94f39 More proper Laser Relay bounding boxes.
This only took me about 200 bajillion hours too.
2016-06-11 13:34:18 +02:00
Ellpeck
14f388fc55 r42! 2016-06-10 22:15:23 +02:00
Ellpeck
527c1533e4 r41! 2016-06-09 17:49:26 +02:00
Ellpeck
b767c8124c r40!
Sorry. So sorry.
2016-06-05 16:09:36 +02:00
Ellpeck
32446f3921 r39!
Update yet again! ~
2016-06-05 12:28:02 +02:00
Ellpeck
c5cf9ec90f Update to forge's new fluid system 2016-06-05 02:16:52 +02:00
Ellpeck
f0b119229e r38!
Sorry I have to do this >_>
2016-06-04 14:07:32 +02:00